From eab156ef74a9977cc61a16b2320aeeea8f8fc8d8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 29 Oct 2019 09:39:39 +1000 Subject: [PATCH] gitlab CI: work around collapsed multiline commands in the rebuild check Multiline commands are currently collapsed with no way of uncollapsing them (https://gitlab.com/gitlab-org/gitlab-runner/issues/3392), so we never see the skopeo invocations. Work around this by touching a file when scheduled and using that to break up the conditions. Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45e0a12b..750fbe86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -139,17 +139,14 @@ variables: # get the full container image name (DISTRIB_VERSION still has indirections) - IMAGE=$(eval echo "$DISTRIB_FLAVOR/$DISTRIB_VERSION:$TAG") - - | - # force rebuild if schedule, reuse otherwise - if [[ $CI_PIPELINE_SOURCE != "schedule" ]] ; - then - # pull the latest upstream image if it exists - skopeo copy docker://$CI_REGISTRY/$UPSTREAM_REPO/$IMAGE \ - docker://$CI_REGISTRY_IMAGE/$IMAGE && exit 0 || true ; + # force rebuild if schedule, reuse otherwise + - if [[ $CI_PIPELINE_SOURCE == "schedule" ]] ; then touch .scheduled; fi + # pull the latest upstream image if it exists + - test -e .scheduled || skopeo copy docker://$CI_REGISTRY/$UPSTREAM_REPO/$IMAGE + docker://$CI_REGISTRY_IMAGE/$IMAGE && exit 0 || true ; - # check if our image is already in the current registry - skopeo inspect docker://$CI_REGISTRY_IMAGE/$IMAGE > /dev/null && exit 0 || true ; - fi + # check if our image is already in the current registry + - test -e .scheduled || skopeo inspect docker://$CI_REGISTRY_IMAGE/$IMAGE > /dev/null && exit 0 || true ; fedora:30@qemu-prep: extends: .fedora@qemu-build