From aead7b4eb70fd7823fad26f1efd24f131091229e Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 15 Oct 2020 17:37:53 +0300 Subject: [PATCH] citemplate: remove fdo.expires-after label This is meant to be used for containers that are going to be periodically rebuilt. For our usecase specifying `fdo.upstream-repo` is enough to garbage collect all the tags from the forks. We also need to rebuild the images, so they don't have include the label anymore. Part-of: --- gitlab/ci_template.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index 65e69bd7ec..f0bd2b41c0 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -18,12 +18,12 @@ variables: # If you are hacking on them or need a them to rebuild, its enough # to change any part of the string of the image you want. ### - FEDORA_TAG: '2020-10-09.0' - CERBERO_TAG: '2020-09-09.2' - ANDROID_TAG: '2020-09-09.2' - MANIFEST_TAG: '2020-06-25.0' - TEST_MANIFEST_TAG: '2020-06-25.0' - INDENT_TAG: '2020-06-29.0' + FEDORA_TAG: '2020-10-22.0' + CERBERO_TAG: '2020-10-22.0' + ANDROID_TAG: '2020-10-22.0' + MANIFEST_TAG: '2020-10-22.0' + TEST_MANIFEST_TAG: '2020-10-22.0' + INDENT_TAG: '2020-10-22.0' GST_UPSTREAM_REPO: 'gstreamer/gst-ci' @@ -250,7 +250,6 @@ default: --label gitlab.project_path=$CI_PROJECT_PATH --label gitlab.project_url=$CI_PROJECT_URL --label fdo.upstream-repo=$GST_UPSTREAM_REPO - --label fdo.expires-after="3w" -f $DOCKERFILE -t $LOCAL_IMAGE $CONTEXT_DIR