aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-05 17:54:19 +0200
committerGitHub <noreply@github.com>2020-10-05 17:54:19 +0200
commit1b16fcfd14b9e761849e53ac2b83c964ad8ac5a9 (patch)
tree059da1b2154604884391c287f9c65f8ef81f96f9
parentcaace52d54c846c948c88a62f973f4d11808532e (diff)
parent0f04cf27c50a7905a12c3d6741410ba87b3cd7b0 (diff)
downloadpodman-1b16fcfd14b9e761849e53ac2b83c964ad8ac5a9.tar.gz
podman-1b16fcfd14b9e761849e53ac2b83c964ad8ac5a9.tar.bz2
podman-1b16fcfd14b9e761849e53ac2b83c964ad8ac5a9.zip
Merge pull request #7920 from cevich/fix_new_ci_smoke
Cirrus: Fix branch-validation failure
-rw-r--r--contrib/cirrus/lib.sh7
-rwxr-xr-xcontrib/cirrus/runner.sh8
2 files changed, 11 insertions, 4 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index b57aee1af..23987938b 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -76,11 +76,12 @@ CIRRUS_CI="${CIRRUS_CI:-false}"
DEST_BRANCH="${DEST_BRANCH:-master}"
CONTINUOUS_INTEGRATION="${CONTINUOUS_INTEGRATION:-false}"
CIRRUS_REPO_NAME=${CIRRUS_REPO_NAME:-podman}
-CIRRUS_BASE_SHA=${CIRRUS_BASE_SHA:-unknown$(date +%s)} # difficult to reliably discover
+# N/B: CIRRUS_BASE_SHA is empty on branch and tag push.
+CIRRUS_BASE_SHA=${CIRRUS_BASE_SHA:-${CIRRUS_LAST_GREEN_CHANGE:-YOU_FOUND_A_BUG}}
CIRRUS_BUILD_ID=${CIRRUS_BUILD_ID:-$RANDOM$(date +%s)} # must be short and unique
-# Needed for linting and code validation
-EPOCH_TEST_COMMIT=${CIRRUS_BASE_SHA:-$CIRRUS_LAST_GREEN_CHANGE}
+# The starting place for linting and code validation
+EPOCH_TEST_COMMIT="$CIRRUS_BASE_SHA"
# Regex of env. vars. to explicitly pass when executing tests
# inside a container or as a rootless user
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index 82e512de9..17bb05019 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -179,7 +179,13 @@ case "$TEST_FLAVOR" in
ext_svc) $SCRIPT_BASE/ext_svc_check.sh ;;
smoke)
make gofmt
- make .gitvalidation
+ # There is little value to validating commits after tag-push
+ # and it's very difficult to automatically determine a starting commit.
+ # $CIRRUS_TAG is only non-empty when executing due to a tag-push
+ # shellcheck disable=SC2154
+ if [[ -z "$CIRRUS_TAG" ]]; then
+ make .gitvalidation
+ fi
;;
automation)
$SCRIPT_BASE/cirrus_yaml_test.py