[bbb-greenlight: 18/18] Simplify CI setup

[Bartłomiej Piotrowski <bpiotrowski src gnome org>]

commit a557bd9132210d1c4c6ce59dbfeba3b25aee1871
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Fri Sep 18 08:11:02 2020 +0200

    Simplify CI setup

 .gitlab-ci.yml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e38140f..d3bc827 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,8 @@
 docker:
-  image: 'registry.fedoraproject.org/fedora:32'
+  image: 'registry.gitlab.gnome.org/infrastructure/oci-images/buildah:latest'
   stage: test
-  variables:
-    STORAGE_DRIVER: 'vfs'
-    BUILDAH_FORMAT: 'docker'
-    BUILDAH_ISOLATION: 'chroot'
   script:
-    - dnf install -y buildah podman runc
-    - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf
-    - |
-      cat >> /etc/containers/libpod.conf << END
-      cgroup_manager = "cgroupfs"
-      events_logger = "file"
-      END
-
-    - buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_TOKEN registry.gitlab.gnome.org
+    - buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - buildah bud -t greenlight .
-    - buildah tag greenlight registry.gitlab.gnome.org/infrastructure/bbb-greenlight:$CI_COMMIT_SHORT_SHA 
registry.gitlab.gnome.org/infrastructure/bbb-greenlight:latest
-    - buildah push registry.gitlab.gnome.org/infrastructure/bbb-greenlight:$CI_COMMIT_SHORT_SHA 
registry.gitlab.gnome.org/infrastructure/bbb-greenlight:latest
+    - buildah tag greenlight $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA $CI_REGISTRY_IMAGE:latest
+    - buildah push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA $CI_REGISTRY_IMAGE:latest