citemplate: use the fd.o pre existing buildah image to build containers

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/308>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcd734b..048418c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ test manifest amd64 docker:
   stage: "build docker"
   variables:
     REPO_SUFFIX: "$TEST_MANIFEST_AMD64_SUFFIX"
-    TAG: "$TEST_MANIFEST_TAG"
+    TAG: "$TEST_MANIFEST_TAG-$GST_UPSTREAM_BRANCH"
 
     CONTEXT_DIR: "docker/test_manifest/"
     DOCKERFILE: "docker/test_manifest/Dockerfile"

diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 4b0ce96..c73de12 100644 (file)
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -150,7 +150,7 @@ variables:
 #
 # All the documentation from citemplates should be applicable here, so please refer there
 .base:
-  image: 'registry.fedoraproject.org/fedora:32'
+  image: "$CI_REGISTRY/freedesktop/ci-templates/buildah:2020-03-24"
   extends:
     - '.global_ci_policy'
   tags: ['gstreamer']
@@ -170,17 +170,13 @@ variables:
     - export LOCAL_IMAGE="$CI_REGISTRY_IMAGE/$REPO_SUFFIX:$TAG"
     - export GST_UPSTREAM_IMAGE="$CI_REGISTRY/$GST_UPSTREAM_REPO/$REPO_SUFFIX:$TAG"
 
-    # FIXME: make an image since there will be multiple jobs running every pipeline
-    - dnf install -y skopeo jq diffutils
-
     # Newer versions of podman/buildah try to set overlayfs mount options when
     # using the vfs driver, and this causes errors.
     - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf
 
-    - *check_image_exists
+    - dnf upgrade -y buildah skopeo jq runc
 
-    # FIXME: make an image since there will be multiple jobs running every pipeline
-    - dnf install -y buildah skopeo jq runc
+    - *check_image_exists
 
     - echo "Building image $LOCAL_IMAGE"