diff options
| author | Chris Evich <cevich@redhat.com> | 2021-01-21 14:56:34 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2021-01-27 10:35:27 -0500 |
| commit | bfc1b66be1f2717e997a84fc33386cf621525208 (patch) | |
| tree | 651155045f7f9c689e6784015f65dc682396f28b /contrib/cirrus/setup_environment.sh | |
| parent | 5d444466e1b55edbf48a2ad4999d4564bc20d01f (diff) | |
| download | podman-bfc1b66be1f2717e997a84fc33386cf621525208.tar.gz podman-bfc1b66be1f2717e997a84fc33386cf621525208.tar.bz2 podman-bfc1b66be1f2717e997a84fc33386cf621525208.zip | |
Cirrus: Fix running Validate task on branches
Followup to dbb9943
Despite skipping the `Smoke` check, it was observed on a *new* branch,
the `validate` task (specifically `git-validation`) will fail. This
is because:
* `$CIRRUS_LAST_GREEN_CHANGE` will be empty on a new branch.
* `$CIRRUS_BASE_SHA` is always empty for runs triggered by branch-push
* `$EPOCH_TEST_COMMIT` will be set to `YOU_FOUND_A_BUG`.
Fix this by eliminating the `Smoke` task entirely, simplifying all
the `make validate` operations into the `validate` cirrus task. Ensure
this task does not run when a new branch or tag is pushed.
Also, eliminate the `$CIRRUS_BUILD_ID` value as it's confusing and not
actually used anywhere. It was formerly used for building VM images,
but this has moved to another repo entirely.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 9267b8a1c..4c95d0254 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -181,7 +181,6 @@ esac # shellcheck disable=SC2154 case "$TEST_FLAVOR" in ext_svc) ;; - smoke) ;& validate) # For some reason, this is also needed for validation make .install.pre-commit |