summaryrefslogtreecommitdiff
path: root/contrib/cirrus/runner.sh
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-01-30 06:26:58 -0500
committerGitHub <noreply@github.com>2021-01-30 06:26:58 -0500
commit735b16e34721449781f82b10555b15e4aead0deb (patch)
tree6ddb00570c65636070df2db978f672acd80b1972 /contrib/cirrus/runner.sh
parent2686e406a650f8ceac4b3763e0cfba16090d1c1b (diff)
parentbfc1b66be1f2717e997a84fc33386cf621525208 (diff)
downloadpodman-735b16e34721449781f82b10555b15e4aead0deb.tar.gz
podman-735b16e34721449781f82b10555b15e4aead0deb.tar.bz2
podman-735b16e34721449781f82b10555b15e4aead0deb.zip
Merge pull request #9063 from cevich/master_fix_validate
Cirrus: Fix running Validate task on branches
Diffstat (limited to 'contrib/cirrus/runner.sh')
-rwxr-xr-xcontrib/cirrus/runner.sh27
1 files changed, 7 insertions, 20 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index 3292cea84..ccbdb63b6 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -23,22 +23,6 @@ function _run_ext_svc() {
$SCRIPT_BASE/ext_svc_check.sh
}
-function _run_smoke() {
- make gofmt
-
- # 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
- # If PR consists of multiple commits, test that each compiles cleanly
- make .gitvalidation
-
- # PRs should include some way to test.
- $SCRIPT_BASE/pr-should-include-tests
- fi
-}
-
function _run_automation() {
$SCRIPT_BASE/cirrus_yaml_test.py
@@ -51,11 +35,14 @@ function _run_automation() {
}
function _run_validate() {
- # Confirm compile via prior task + cache
- bin/podman --version
- bin/podman-remote --version
+ # git-validation tool fails if $EPOCH_TEST_COMMIT is empty
+ # shellcheck disable=SC2154
+ if [[ -n "$EPOCH_TEST_COMMIT" ]]; then
+ make validate
+ else
+ warn "Skipping git-validation since \$EPOCH_TEST_COMMIT is empty"
+ fi
- make validate # Some items require a build
}
function _run_unit() {