diff options
| author | Chris Evich <cevich@redhat.com> | 2022-05-10 10:22:01 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2022-06-14 13:15:05 -0400 |
| commit | 88a7ce7d511336fd3505ee9701d118331bcbee4c (patch) | |
| tree | 01f6c42ef7ee164c8c97b96dfccdc0c2ef6af575 /contrib/cirrus/setup_environment.sh | |
| parent | 484f1834ab17a2ccb56ed05dfbf50941a2e58d25 (diff) | |
| download | podman-88a7ce7d511336fd3505ee9701d118331bcbee4c.tar.gz podman-88a7ce7d511336fd3505ee9701d118331bcbee4c.tar.bz2 podman-88a7ce7d511336fd3505ee9701d118331bcbee4c.zip | |
Cirrus: Guarantee $DEST_BRANCH is passed through
There are several runtime contexts (rootless and container) where
`$DEST_BRANCH` is needed but was not supplied. A prior commit
(c4865767171b) removed the default value, `main` which was being
set incorrectly when CI ran on release branches. Fix this by ensuring
the variable is non-empty upon entry to `setup_environment.sh`, then
ensure it gets passed through to child environments by way of the
`/etc/ci_environment` file. This will maintain compatibility with
both CI and `hack/get_ci_vm.sh` use.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index e3eb46783..e8aabe79d 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -25,7 +25,7 @@ msg "************************************************************" show_env_vars req_env_vars USER HOME GOSRC SCRIPT_BASE TEST_FLAVOR TEST_ENVIRON \ - PODBIN_NAME PRIV_NAME DISTRO_NV + PODBIN_NAME PRIV_NAME DISTRO_NV DEST_BRANCH # Verify basic dependencies for depbin in go rsync unzip sha256sum curl make python3 git |