diff --git a/tasks/scripts/downgrade-test b/tasks/scripts/downgrade-test index d999e960..11778ed2 100755 --- a/tasks/scripts/downgrade-test +++ b/tasks/scripts/downgrade-test @@ -51,8 +51,7 @@ docker-compose \ -f $inputs/ci/overrides/docker-compose.latest.yml \ up --no-build -d -# This is done temporarily to bypass fly issue https://github.com/concourse/concourse/issues/5938 -$inputs/ci/tasks/scripts/verify-upgrade-downgraded-pipeline-temporary +$inputs/ci/tasks/scripts/verify-upgrade-downgrade-pipeline # upgrade back and verify docker-compose \ diff --git a/tasks/scripts/verify-downgraded-pipeline-temporary b/tasks/scripts/verify-downgraded-pipeline-temporary deleted file mode 100755 index ff46b0ff..00000000 --- a/tasks/scripts/verify-downgraded-pipeline-temporary +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash -# vim: set ft=sh - -set -e -u -x - -cd $(dirname $0)/../../.. - -web_url=http://localhost:8080 - -until curl --silent --fail "$web_url/api/v1/info"; do - echo "waiting for /api/v1/info..." - sleep 2 -done - -echo "installing fly..." -curl "$web_url/api/v1/cli?platform=linux&arch=amd64" -o /usr/local/bin/fly -chmod +x /usr/local/bin/fly - -echo "logging in..." -fly -t local login -c "$web_url" -u test -p test - -# wait for worker to be available -worker=$(docker ps -q --filter name=worker) -until fly -t local workers | grep "${worker}.*running"; do - echo "waiting for running worker..." - sleep 2 -done - -# test that the pipeline exists -fly -t local pipelines \ - | grep "test-pipeline" - -# test that our old pipeline has not changed -# -# note: this used to grep for 'no changes', but that's a bit brittle, since it -# also fails for fields which were made omitempty (i.e. container_limits), as -# was the case for v6.3. -fly -t local set-pipeline -n \ - -p test-pipeline \ - -c ci/pipelines/upgrade-downgrade-pipeline.yml - -# test that succeeded build shown in build history -fly -t local builds \ - | grep "test-pipeline/test-job.*1.*succeeded" - -# Commented out temporarily until https://github.com/concourse/concourse/issues/5938 is addressed -# test that we can still read build logs -#fly -t local watch -j "test-pipeline/test-job" \ -# | grep "succeeded" - -# TODO pre-5.6 fly check-resource outputs 'checked' -# for a succussful check when since 5.6 it outputs -# `1 test-resource succeeded`. Thus it needs to consider -# a case when downgrade to any version under 5.6. -# Once 5.6 has shiped it then doesn't need to -# grep 'checked' anymore - -# test that we can check our resources -fly -t local check-resource -r "test-pipeline/test-resource" \ - | grep -E "(test-resource.*succeeded|checked)"