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 #292 from thockin/e2e-vflag 

Move --v into e2e framework (always same value)
This commit is contained in:
Kubernetes Prow Robot 2020-10-04 07:23:06 -07:00 committed by GitHub
parent 410c5950b8 771011f0cc
commit 5467f372bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test_e2e.sh
View File

@ -131,6 +131,7 @@ function GIT_SYNC() {
--env XDG_CONFIG_HOME=$DIR \ --env XDG_CONFIG_HOME=$DIR \
e2e/git-sync:$(make -s version)__$(go env GOOS)_$(go env GOARCH) \ e2e/git-sync:$(make -s version)__$(go env GOOS)_$(go env GOARCH) \
--add-user \ --add-user \
--v=5 \
"$@" "$@"
} }
@ -150,7 +151,6 @@ testcase "head-once"
echo "$TESTCASE" > "$REPO"/file echo "$TESTCASE" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE" git -C "$REPO" commit -qam "$TESTCASE"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--one-time \ --one-time \
--repo="file://$REPO" \ --repo="file://$REPO" \
--branch=master \ --branch=master \
@ -172,7 +172,6 @@ testcase "default-sync"
echo "$TESTCASE 1" > "$REPO"/file echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--root="$ROOT" \ --root="$ROOT" \
@ -206,7 +205,6 @@ testcase "head-sync"
echo "$TESTCASE 1" > "$REPO"/file echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--branch=master \ --branch=master \
@ -245,7 +243,6 @@ echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
git -C "$REPO" checkout -q master git -C "$REPO" checkout -q master
GIT_SYNC \ GIT_SYNC \
--v=5 \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--branch="$BRANCH" \ --branch="$BRANCH" \
@ -286,7 +283,6 @@ echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
git -C "$REPO" tag -f "$TAG" >/dev/null git -C "$REPO" tag -f "$TAG" >/dev/null
GIT_SYNC \ GIT_SYNC \
--v=5 \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--rev="$TAG" \ --rev="$TAG" \
@ -332,7 +328,6 @@ echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
git -C "$REPO" tag -af "$TAG" -m "$TESTCASE 1" >/dev/null git -C "$REPO" tag -af "$TAG" -m "$TESTCASE 1" >/dev/null
GIT_SYNC \ GIT_SYNC \
--v=5 \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--rev="$TAG" \ --rev="$TAG" \
@ -377,7 +372,6 @@ echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
REV=$(git -C "$REPO" rev-list -n1 HEAD) REV=$(git -C "$REPO" rev-list -n1 HEAD)
GIT_SYNC \ GIT_SYNC \
--v=5 \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--rev="$REV" \ --rev="$REV" \
@ -413,7 +407,6 @@ echo "$TESTCASE" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE" git -C "$REPO" commit -qam "$TESTCASE"
REV=$(git -C "$REPO" rev-list -n1 HEAD) REV=$(git -C "$REPO" rev-list -n1 HEAD)
GIT_SYNC \ GIT_SYNC \
--v=5 \
--one-time \ --one-time \
--repo="file://$REPO" \ --repo="file://$REPO" \
--rev="$REV" \ --rev="$REV" \
@ -434,7 +427,6 @@ testcase "crash-cleanup-retry"
echo "$TESTCASE 1" > "$REPO"/file echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--one-time \ --one-time \
--repo="file://$REPO" \ --repo="file://$REPO" \
--root="$ROOT" \ --root="$ROOT" \
@ -447,7 +439,6 @@ assert_file_eq "$ROOT"/link/file "$TESTCASE 1"
rm -f "$ROOT"/link rm -f "$ROOT"/link
# Try again # Try again
GIT_SYNC \ GIT_SYNC \
--v=5 \
--one-time \ --one-time \
--repo="file://$REPO" \ --repo="file://$REPO" \
--root="$ROOT" \ --root="$ROOT" \
@ -468,7 +459,6 @@ echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
GIT_SYNC \ GIT_SYNC \
--git="$SLOW_GIT" \ --git="$SLOW_GIT" \
--v=5 \
--one-time \ --one-time \
--timeout=1 \ --timeout=1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
@ -480,7 +470,6 @@ assert_file_absent "$ROOT"/link/file
# run with slow_git but without timing out # run with slow_git but without timing out
GIT_SYNC \ GIT_SYNC \
--git="$SLOW_GIT" \ --git="$SLOW_GIT" \
--v=5 \
--wait=0.1 \ --wait=0.1 \
--timeout=16 \ --timeout=16 \
--repo="file://$REPO" \ --repo="file://$REPO" \
@ -510,7 +499,6 @@ echo "$TESTCASE 1" > "$REPO"/file
expected_depth="1" expected_depth="1"
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--depth="$expected_depth" \ --depth="$expected_depth" \
@ -560,7 +548,6 @@ GIT_SYNC \
--git="$ASKPASS_GIT" \ --git="$ASKPASS_GIT" \
--username="my-username" \ --username="my-username" \
--password="wrong" \ --password="wrong" \
--v=5 \
--one-time \ --one-time \
--repo="file://$REPO" \ --repo="file://$REPO" \
--branch=master \ --branch=master \
@ -575,7 +562,6 @@ GIT_SYNC \
--git="$ASKPASS_GIT" \ --git="$ASKPASS_GIT" \
--username="my-username" \ --username="my-username" \
--password="my-password" \ --password="my-password" \
--v=5 \
--one-time \ --one-time \
--repo="file://$REPO" \ --repo="file://$REPO" \
--branch=master \ --branch=master \
@ -607,7 +593,6 @@ git -C "$REPO" commit -qam "$TESTCASE 1"
GIT_SYNC \ GIT_SYNC \
--git="$ASKPASS_GIT" \ --git="$ASKPASS_GIT" \
--askpass-url="http://localhost:$NCPORT/git_askpass" \ --askpass-url="http://localhost:$NCPORT/git_askpass" \
--v=5 \
--one-time \ --one-time \
--repo="file://$REPO" \ --repo="file://$REPO" \
--branch=master \ --branch=master \
@ -628,7 +613,6 @@ assert_file_absent "$ROOT"/link/file
GIT_SYNC \ GIT_SYNC \
--git="$ASKPASS_GIT" \ --git="$ASKPASS_GIT" \
--askpass-url="http://localhost:$NCPORT/git_askpass" \ --askpass-url="http://localhost:$NCPORT/git_askpass" \
--v=5 \
--one-time \ --one-time \
--repo="file://$REPO" \ --repo="file://$REPO" \
--branch=master \ --branch=master \
@ -650,7 +634,6 @@ testcase "sync_hook_command"
echo "$TESTCASE 1" > "$REPO"/file echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--root="$ROOT" \ --root="$ROOT" \
@ -684,7 +667,6 @@ freencport
echo "$TESTCASE 1" > "$REPO"/file echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--root="$ROOT" \ --root="$ROOT" \
--webhook-url="http://127.0.0.1:$NCPORT" \ --webhook-url="http://127.0.0.1:$NCPORT" \
@ -727,7 +709,6 @@ freencport
echo "$TESTCASE 1" > "$REPO"/file echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--root="$ROOT" \ --root="$ROOT" \
--webhook-url="http://127.0.0.1:$NCPORT" \ --webhook-url="http://127.0.0.1:$NCPORT" \
@ -754,7 +735,6 @@ echo "$TESTCASE 1" > "$REPO"/file
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
GIT_SYNC \ GIT_SYNC \
--git="$SLOW_GIT" \ --git="$SLOW_GIT" \
--v=5 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--root="$ROOT" \ --root="$ROOT" \
--http-bind=":$BINDPORT" \ --http-bind=":$BINDPORT" \
@ -815,7 +795,6 @@ git -C "$NESTED_SUBMODULE" commit -aqm "init nested-submodule file"
git -C "$REPO" submodule add -q file://$SUBMODULE git -C "$REPO" submodule add -q file://$SUBMODULE
git -C "$REPO" commit -aqm "add submodule" git -C "$REPO" commit -aqm "add submodule"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--root="$ROOT" \ --root="$ROOT" \
@ -903,7 +882,6 @@ git -C "$REPO" submodule add -q file://$SUBMODULE
git -C "$REPO" config -f "$REPO"/.gitmodules submodule.$SUBMODULE_REPO_NAME.shallow true git -C "$REPO" config -f "$REPO"/.gitmodules submodule.$SUBMODULE_REPO_NAME.shallow true
git -C "$REPO" commit -qam "$TESTCASE 1" git -C "$REPO" commit -qam "$TESTCASE 1"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
--depth="$expected_depth" \ --depth="$expected_depth" \
@ -979,7 +957,6 @@ git -C "$REPO" submodule add -q file://$SUBMODULE
git -C "$REPO" commit -aqm "add submodule" git -C "$REPO" commit -aqm "add submodule"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--submodules=off \ --submodules=off \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
@ -1022,7 +999,6 @@ git -C "$REPO" submodule add -q file://$SUBMODULE
git -C "$REPO" commit -aqm "add submodule" git -C "$REPO" commit -aqm "add submodule"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--submodules=shallow \ --submodules=shallow \
--wait=0.1 \ --wait=0.1 \
--repo="file://$REPO" \ --repo="file://$REPO" \
@ -1055,7 +1031,6 @@ sleep 3 # wait for sshd to come up
IP=$(docker inspect "$CTR" | jq -r .[0].NetworkSettings.IPAddress) IP=$(docker inspect "$CTR" | jq -r .[0].NetworkSettings.IPAddress)
git -C "$REPO" commit -qam "$TESTCASE" git -C "$REPO" commit -qam "$TESTCASE"
GIT_SYNC \ GIT_SYNC \
--v=5 \
--one-time \ --one-time \
--ssh \ --ssh \
--ssh-known-hosts=false \ --ssh-known-hosts=false \