kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #910 from sdowell/e2e-image-build 

test: harden e2e image build logic
This commit is contained in:
Kubernetes Prow Robot 2024-07-16 16:37:05 -07:00 committed by GitHub
parent 6af1e6921d f6f7401e6b
commit f73ee0008d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test_e2e.sh
View File

@ -182,9 +182,13 @@ function docker_signal() {
# tags are system-global, but one might have multiple repos checked out. # tags are system-global, but one might have multiple repos checked out.
E2E_TAG=$(git rev-parse --show-toplevel | sed 's|/|_|g') E2E_TAG=$(git rev-parse --show-toplevel | sed 's|/|_|g')
# Setting IMAGE forces the test to use a specific image instead of the current # Setting GIT_SYNC_E2E_IMAGE forces the test to use a specific image instead of the
# tree. # current tree.
IMAGE="${IMAGE:-"e2e/git-sync:${E2E_TAG}__$(go env GOOS)_$(go env GOARCH)"}" build_container=false
if [[ "${GIT_SYNC_E2E_IMAGE:-unset}" == "unset" ]]; then
GIT_SYNC_E2E_IMAGE="e2e/git-sync:${E2E_TAG}__$(go env GOOS)_$(go env GOARCH)"
build_container=true
fi
# DIR is the directory in which all this test's state lives. # DIR is the directory in which all this test's state lives.
RUNID="${RANDOM}${RANDOM}" RUNID="${RANDOM}${RANDOM}"
@ -291,7 +295,7 @@ function GIT_SYNC() {
-v "$DOT_SSH/1/id_test":"/ssh/secret.1":ro \ -v "$DOT_SSH/1/id_test":"/ssh/secret.1":ro \
-v "$DOT_SSH/2/id_test":"/ssh/secret.2":ro \ -v "$DOT_SSH/2/id_test":"/ssh/secret.2":ro \
-v "$DOT_SSH/3/id_test":"/ssh/secret.3":ro \ -v "$DOT_SSH/3/id_test":"/ssh/secret.3":ro \
"${IMAGE}" \ "${GIT_SYNC_E2E_IMAGE}" \
-v=6 \ -v=6 \
--add-user \ --add-user \
--group-write \ --group-write \
@ -3468,7 +3472,7 @@ if [[ "$#" == 0 ]]; then
fi fi
# Build it # Build it
make container REGISTRY=e2e VERSION="${E2E_TAG}" ALLOW_STALE_APT=1 $build_container && make container REGISTRY=e2e VERSION="${E2E_TAG}" ALLOW_STALE_APT=1
make test-tools REGISTRY=e2e make test-tools REGISTRY=e2e
function finish() { function finish() {