gitlab CI: update to latest ci-templates

We can ditch the custom localhost usages and instead use the vmctl and
ssh-config aliases.

Signed-off-by:	Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e802f5b2a2faea1ed7d6453ae0da0febd02f754..7883f602a43a8fb6272dc0c75f39a83fca175e22 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
 #                                      #
 ########################################
 
-.templates_sha: &template_sha 18194044f0f984c8815bc9a1a146582f6bf15d41 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha bbe5232986c9b98eb1efe62484e07216f7d1a4df # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
   # Alpine container builder template
@@ -80,61 +80,61 @@ variables:
 .fedora:33:
   extends: .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_TAG: '2021-05-19.1'
+    FDO_DISTRIBUTION_TAG: '2021-07-26.0'
     FDO_DISTRIBUTION_VERSION: '33'
 
 .fedora:34:
   extends: .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_TAG: '2021-05-19.1'
+    FDO_DISTRIBUTION_TAG: '2021-07-26.0'
     FDO_DISTRIBUTION_VERSION: '34'
 
 .ubuntu:21.04:
   extends: .fdo.distribution-image@ubuntu
   variables:
-    FDO_DISTRIBUTION_TAG: '2021-05-19.1'
+    FDO_DISTRIBUTION_TAG: '2021-07-26.0'
     FDO_DISTRIBUTION_VERSION: '21.04'
 
 .ubuntu:20.10:
   extends: .fdo.distribution-image@ubuntu
   variables:
-    FDO_DISTRIBUTION_TAG: '2021-05-19.1'
+    FDO_DISTRIBUTION_TAG: '2021-07-26.0'
     FDO_DISTRIBUTION_VERSION: '20.10'
 
 .debian:stable:
   extends: .fdo.distribution-image@debian
   variables:
-    FDO_DISTRIBUTION_TAG: '2021-05-19.1'
+    FDO_DISTRIBUTION_TAG: '2021-07-26.0'
     FDO_DISTRIBUTION_VERSION: 'stable'
 
 .debian:sid:
   extends: .fdo.distribution-image@debian
   variables:
-    FDO_DISTRIBUTION_TAG: '2021-05-19.1'
+    FDO_DISTRIBUTION_TAG: '2021-07-26.0'
     FDO_DISTRIBUTION_VERSION: 'sid'
 
 .centos:7:
   extends: .fdo.distribution-image@centos
   variables:
-    FDO_DISTRIBUTION_TAG: '2021-05-19.1'
+    FDO_DISTRIBUTION_TAG: '2021-07-26.0'
     FDO_DISTRIBUTION_VERSION: '7'
 
 .centos:8:
   extends: .fdo.distribution-image@centos
   variables:
-    FDO_DISTRIBUTION_TAG: '2021-05-19.1'
+    FDO_DISTRIBUTION_TAG: '2021-07-26.0'
     FDO_DISTRIBUTION_VERSION: '8'
 
 .arch:rolling:
   extends: .fdo.distribution-image@arch
   variables:
-    FDO_DISTRIBUTION_TAG: '2021-05-19.1'
+    FDO_DISTRIBUTION_TAG: '2021-07-26.0'
     FDO_DISTRIBUTION_VERSION: 'rolling'
 
 .alpine:latest:
   extends: .fdo.distribution-image@alpine
   variables:
-    FDO_DISTRIBUTION_TAG: '2021-05-19.1'
+    FDO_DISTRIBUTION_TAG: '2021-07-26.0'
     FDO_DISTRIBUTION_VERSION: 'latest'
 
 
@@ -236,7 +236,7 @@ check-merge-request:
     - kvm
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_TAG: qemu-2021-05-19.1
+    FDO_DISTRIBUTION_TAG: qemu-2021-07-26.0
   allow_failure: true
 
 # Always rebuilds the container
@@ -847,7 +847,7 @@ soname:
 
 .check_tainted: &check_tainted |
   # make sure the kernel is not tainted
-  if [[ "$(ssh localhost -p 5555 cat /proc/sys/kernel/tainted)" -gt 0 ]];
+  if [[ "$(/app/vmctl exec cat /proc/sys/kernel/tainted)" -gt 0 ]];
   then
     echo tainted kernel ;
     exit 1 ;
@@ -868,7 +868,7 @@ soname:
 
     - *check_tainted
 
-    - "scp -P 5555 -r $PWD localhost:"
+    - "scp -r $PWD vm:"
     - echo "CI_JOB_ID=\"$CI_JOB_ID\"" > sshenv
     - echo "CI_JOB_NAME=\"$CI_JOB_NAME\"" >> sshenv
     - echo "MESON_BUILDDIR=\"$MESON_BUILDDIR\"" >> sshenv

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 8d964cbc74c2acf4fc86b1d0b87bc3bc6e87c74a..9605ac9259a0c9a8ae91f9148e4dba1f5448381f 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -6,7 +6,7 @@
 #                                      #
 ########################################
 
-.templates_sha: &template_sha 18194044f0f984c8815bc9a1a146582f6bf15d41 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha bbe5232986c9b98eb1efe62484e07216f7d1a4df # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
   {% for distribution in distributions|map(attribute='name')|unique()|sort() %}
@@ -428,7 +428,7 @@ soname:
 
 .check_tainted: &check_tainted |
   # make sure the kernel is not tainted
-  if [[ "$(ssh localhost -p 5555 cat /proc/sys/kernel/tainted)" -gt 0 ]];
+  if [[ "$(/app/vmctl exec cat /proc/sys/kernel/tainted)" -gt 0 ]];
   then
     echo tainted kernel ;
     exit 1 ;
@@ -451,7 +451,7 @@ soname:
 
     - *check_tainted
 
-    - "scp -P 5555 -r $PWD localhost:"
+    - "scp -r $PWD vm:"
     - echo "CI_JOB_ID=\"$CI_JOB_ID\"" > sshenv
     - echo "CI_JOB_NAME=\"$CI_JOB_NAME\"" >> sshenv
     - echo "MESON_BUILDDIR=\"$MESON_BUILDDIR\"" >> sshenv

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 44a616044d2c159ae0134e34380637a4961d080f..6524b6738c924f21bb0a46a0aa7fb23c96697413 100644 (file)
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -3,7 +3,7 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2021-05-19.1'
+.default_tag: &default_tag '2021-07-26.0'
 
 distributions:
   - name: fedora