diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-16 07:48:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 07:48:03 -0700 |
| commit | b88126a8f859cc75ecfdeddd9ba1cc39c537aa4b (patch) | |
| tree | 49d5a3ea7de3c07101376fbb69e4e23dd2b6aebb /contrib | |
| parent | d985723506a29766ed21585ba8541033db6bd572 (diff) | |
| parent | 6787ef24bc9ab0fb0f29d24122ebe09bab0124bd (diff) | |
| download | podman-b88126a8f859cc75ecfdeddd9ba1cc39c537aa4b.tar.gz podman-b88126a8f859cc75ecfdeddd9ba1cc39c537aa4b.tar.bz2 podman-b88126a8f859cc75ecfdeddd9ba1cc39c537aa4b.zip | |
Merge pull request #5824 from cevich/fix_dest_branch
Cirrus: Necessary changes for v1.9 branch automation
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/lib.sh | 4 | ||||
| -rwxr-xr-x | contrib/cirrus/logformatter | 8 | ||||
| -rw-r--r-- | contrib/gate/Dockerfile | 1 |
3 files changed, 9 insertions, 4 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" diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter index 6a86f6a49..738d2e19d 100755 --- a/contrib/cirrus/logformatter +++ b/contrib/cirrus/logformatter @@ -220,8 +220,8 @@ END_HTML $cirrus_task = $1; } - # BATS handling - if ($line =~ /^1\.\.\d+$/) { + # BATS handling (used also for apiv2 tests, which emit TAP output) + if ($line =~ /^1\.\.\d+$/ || $line =~ m!/test-apiv2!) { $looks_like_bats = 1; } if ($looks_like_bats) { @@ -234,6 +234,10 @@ END_HTML elsif ($line =~ /^#\s/) { $css = 'log' } if ($css) { + # Make it linkable, e.g. foo.html#t--00001 + if ($line =~ /^(not\s+)?ok\s+(\d+)/) { + $line = sprintf("<a name='t--%05d'>%s</a>", $2, $line); + } $line = "<span class='bats-$css'>$line</span>"; } diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile index 54bd2cbde..4fddae557 100644 --- a/contrib/gate/Dockerfile +++ b/contrib/gate/Dockerfile @@ -21,6 +21,7 @@ RUN dnf -y install \ procps-ng \ python \ python3-dateutil \ + python3-pip \ python3-psutil \ python3-pytoml \ python3-pyyaml \ |