From: Andrea Bolognani <abologna@redhat.com>
Date: Tue, 4 May 2021 08:31:38 +0000 (+0200)
Subject: ci: Rename CentOS Stream 8 and openSUSE Leap 15.2 containers
X-Git-Tag: v7.4.0-rc1~237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=043adb8b509c73ac55bc004849746ba3631d69bb;p=thirdparty%2Flibvirt.git

ci: Rename CentOS Stream 8 and openSUSE Leap 15.2 containers

The names have been recently changed in libvirt-ci to be more
accurate, so we should follow along.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2f541efbc..68e71c842b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,10 +143,10 @@ x64-centos-8-container:
   variables:
     NAME: centos-8
 
-x64-centos-stream-container:
+x64-centos-stream-8-container:
   extends: .container_job
   variables:
-    NAME: centos-stream
+    NAME: centos-stream-8
 
 x64-debian-10-container:
   extends: .container_job
@@ -173,10 +173,10 @@ x64-fedora-rawhide-container:
   variables:
     NAME: fedora-rawhide
 
-x64-opensuse-152-container:
+x64-opensuse-leap-152-container:
   extends: .container_job
   variables:
-    NAME: opensuse-152
+    NAME: opensuse-leap-152
 
 x64-ubuntu-1804-container:
   extends: .container_job
@@ -339,12 +339,12 @@ x64-centos-8-clang:
     CC: clang
     RPM: skip
 
-x64-centos-stream:
+x64-centos-stream-8:
   extends: .native_build_job
   needs:
-    - x64-centos-stream-container
+    - x64-centos-stream-8-container
   variables:
-    NAME: centos-stream
+    NAME: centos-stream-8
     RPM: skip
 
 x64-fedora-32:
@@ -378,12 +378,12 @@ x64-fedora-rawhide-clang:
     CC: clang
     RPM: skip
 
-x64-opensuse-152:
+x64-opensuse-leap-152:
   extends: .native_build_job
   needs:
-    - x64-opensuse-152-container
+    - x64-opensuse-leap-152-container
   variables:
-    NAME: opensuse-152
+    NAME: opensuse-leap-152
     RPM: skip
 
 x64-ubuntu-1804:
@@ -539,9 +539,9 @@ website:
 
 codestyle:
   stage: builds
-  image: $CI_REGISTRY_IMAGE/ci-opensuse-152:latest
+  image: $CI_REGISTRY_IMAGE/ci-opensuse-leap-152:latest
   needs:
-    - x64-opensuse-152-container
+    - x64-opensuse-leap-152-container
   before_script:
     - *script_variables
   script:
diff --git a/ci/containers/centos-stream.Dockerfile b/ci/containers/centos-stream-8.Dockerfile
similarity index 100%
rename from ci/containers/centos-stream.Dockerfile
rename to ci/containers/centos-stream-8.Dockerfile
diff --git a/ci/containers/opensuse-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile
similarity index 100%
rename from ci/containers/opensuse-152.Dockerfile
rename to ci/containers/opensuse-leap-152.Dockerfile