Skip to content

Commit

Permalink
[testing] Switch user for e2e tests
Browse files Browse the repository at this point in the history
Signed-off-by: Vladimir Portnov <[email protected]>
  • Loading branch information
Taior committed Oct 31, 2024
1 parent 1003812 commit 351edf6
Show file tree
Hide file tree
Showing 20 changed files with 429 additions and 206 deletions.
6 changes: 5 additions & 1 deletion .github/ci_templates/e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ run: |
echo "DHCTL log file: $dhctl_log_file"

user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"


{!{- if and (eq $script_arg "run-test") $run_from_issue_or_pr }!}
Expand Down Expand Up @@ -164,6 +164,7 @@ run: |
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
${TERRAFORM_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/{!{ $script_eks }!} {!{ $script_arg }!}

Expand All @@ -180,6 +181,7 @@ run: |
-v "$PWD/resources.yml:/resources.yml" \
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-u ${user_runner_id} \
${INSTALL_IMAGE_NAME} \
bash -c "dhctl bootstrap-phase install-deckhouse \
--kubeconfig=/tmp/eks-${LAYOUT}-${CRI}-${KUBERNETES_VERSION}.kubeconfig \
Expand All @@ -204,6 +206,7 @@ run: |
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
${TERRAFORM_IMAGE_NAME} \
bash -c "/deckhouse/testing/cloud_layouts/{!{ $script_eks }!} wait_deckhouse_ready && \
/deckhouse/testing/cloud_layouts/{!{ $script_eks }!} wait_cluster_ready"
Expand Down Expand Up @@ -257,6 +260,7 @@ run: |
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/{!{ $script }!} {!{ $script_arg }!}
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/e2e-abort-aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -325,6 +325,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -594,7 +595,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -615,6 +616,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -884,7 +886,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -905,6 +907,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -1174,7 +1177,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -1195,6 +1198,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -1464,7 +1468,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -1485,6 +1489,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -1754,7 +1759,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -1775,6 +1780,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -2044,7 +2050,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -2065,6 +2071,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/e2e-abort-azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -329,6 +329,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -600,7 +601,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -623,6 +624,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -894,7 +896,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -917,6 +919,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -1188,7 +1191,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -1211,6 +1214,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -1482,7 +1486,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -1505,6 +1509,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -1776,7 +1781,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -1799,6 +1804,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down Expand Up @@ -2070,7 +2076,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
docker run --rm \
-e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \
Expand All @@ -2093,6 +2099,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
-w /deckhouse \
${INSTALL_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script.sh cleanup
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/e2e-abort-eks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
chmod 755 $(pwd)/testing/cloud_layouts/script_eks.sh
docker run --rm \
Expand All @@ -328,6 +328,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
${TERRAFORM_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script_eks.sh cleanup
Expand Down Expand Up @@ -602,7 +603,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
chmod 755 $(pwd)/testing/cloud_layouts/script_eks.sh
docker run --rm \
Expand All @@ -620,6 +621,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
${TERRAFORM_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script_eks.sh cleanup
Expand Down Expand Up @@ -894,7 +896,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
chmod 755 $(pwd)/testing/cloud_layouts/script_eks.sh
docker run --rm \
Expand All @@ -912,6 +914,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
${TERRAFORM_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script_eks.sh cleanup
Expand Down Expand Up @@ -1186,7 +1189,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
chmod 755 $(pwd)/testing/cloud_layouts/script_eks.sh
docker run --rm \
Expand All @@ -1204,6 +1207,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
${TERRAFORM_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script_eks.sh cleanup
Expand Down Expand Up @@ -1478,7 +1482,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
chmod 755 $(pwd)/testing/cloud_layouts/script_eks.sh
docker run --rm \
Expand All @@ -1496,6 +1500,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
${TERRAFORM_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script_eks.sh cleanup
Expand Down Expand Up @@ -1770,7 +1775,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
chmod 755 $(pwd)/testing/cloud_layouts/script_eks.sh
docker run --rm \
Expand All @@ -1788,6 +1793,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
${TERRAFORM_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script_eks.sh cleanup
Expand Down Expand Up @@ -2062,7 +2068,7 @@ jobs:
echo "DHCTL log file: $dhctl_log_file"
user_runner_id=$(id -u):$(id -g)
echo "user_runner_id $user_runner_id"
echo running Docker with "user_runner_id $user_runner_id"
chmod 755 $(pwd)/testing/cloud_layouts/script_eks.sh
docker run --rm \
Expand All @@ -2080,6 +2086,7 @@ jobs:
-v $(pwd)/testing:/deckhouse/testing \
-v $(pwd)/release.yaml:/deckhouse/release.yaml \
-v ${TMP_DIR_PATH}:/tmp \
-u ${user_runner_id} \
${TERRAFORM_IMAGE_NAME} \
bash /deckhouse/testing/cloud_layouts/script_eks.sh cleanup
Expand Down
Loading

0 comments on commit 351edf6

Please sign in to comment.