diff options
| author | Chris Evich <cevich@redhat.com> | 2020-04-15 12:05:41 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-04-15 16:39:59 -0400 |
| commit | 6787ef24bc9ab0fb0f29d24122ebe09bab0124bd (patch) | |
| tree | 49d5a3ea7de3c07101376fbb69e4e23dd2b6aebb /contrib/cirrus | |
| parent | caf22cf5aa28a2eb5e032782d6df1ff746b7954e (diff) | |
| download | podman-6787ef24bc9ab0fb0f29d24122ebe09bab0124bd.tar.gz podman-6787ef24bc9ab0fb0f29d24122ebe09bab0124bd.tar.bz2 podman-6787ef24bc9ab0fb0f29d24122ebe09bab0124bd.zip | |
Cirrus: Necessary changes for v1.9 branch automation
Also, drop image_prune task which only runs on the master branch by
design.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus')
| -rw-r--r-- | contrib/cirrus/lib.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 2031432b9..113551a10 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -50,7 +50,7 @@ fi # Defaults when not running under CI export CI="${CI:-false}" CIRRUS_CI="${CIRRUS_CI:-false}" -DEST_BRANCH="${DEST_BRANCH:-master}" +DEST_BRANCH="${DEST_BRANCH:-v1.9}" CONTINUOUS_INTEGRATION="${CONTINUOUS_INTEGRATION:-false}" CIRRUS_REPO_NAME=${CIRRUS_REPO_NAME:-libpod} CIRRUS_BASE_SHA=${CIRRUS_BASE_SHA:-unknown$(date +%s)} # difficult to reliably discover @@ -71,7 +71,7 @@ export BUILT_IMAGE_SUFFIX="${BUILT_IMAGE_SUFFIX:--$CIRRUS_REPO_NAME-${CIRRUS_BUI # IN_PODMAN container image IN_PODMAN_IMAGE="quay.io/libpod/in_podman:$DEST_BRANCH" # Image for uploading releases -UPLDREL_IMAGE="quay.io/libpod/upldrel:master" +UPLDREL_IMAGE="quay.io/libpod/upldrel:v1.9" # Avoid getting stuck waiting for user input export DEBIAN_FRONTEND="noninteractive" |