gitlab CI: remove a now-unused VERSION variable

This became obsolete with FDO_DISTRIBUTION_VERSION being autogenerated by
templates.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f6598d0e1044f564cee164bf38ffdbdd812aed4..04882d7ad10ec3647d5e5776ce11df98557ff20e 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -349,7 +349,6 @@ fedora:31@container-clean:
     - .container-clean
   variables:
     GIT_STRATEGY: none
-    FEDORA_VERSION: '31'
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
     FDO_DISTRIBUTION_VERSION: '31'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@@ -359,7 +358,6 @@ fedora:32@container-clean:
     - .container-clean
   variables:
     GIT_STRATEGY: none
-    FEDORA_VERSION: '32'
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
     FDO_DISTRIBUTION_VERSION: '32'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@@ -369,7 +367,6 @@ ubuntu:19.10@container-clean:
     - .container-clean
   variables:
     GIT_STRATEGY: none
-    UBUNTU_VERSION: '19.10'
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
     FDO_DISTRIBUTION_VERSION: '19.10'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
@@ -379,7 +376,6 @@ arch:rolling@container-clean:
     - .container-clean
   variables:
     GIT_STRATEGY: none
-    ARCH_VERSION: 'rolling'
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/arch/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
     FDO_DISTRIBUTION_VERSION: 'rolling'
     FDO_DISTRIBUTION_TAG: $ARCH_TAG
@@ -389,7 +385,6 @@ alpine:latest@container-clean:
     - .container-clean
   variables:
     GIT_STRATEGY: none
-    ALPINE_VERSION: 'latest'
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/alpine/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
     FDO_DISTRIBUTION_VERSION: 'latest'
     FDO_DISTRIBUTION_TAG: $ALPINE_TAG

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 821f39d7bed13aad231932ca84852c68d627df0e..756669e47f21e30a7bde565b05ce1b5e27aa9eec 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -314,7 +314,6 @@ freebsd:11.2@container-prep:
     - .container-clean
   variables:
     GIT_STRATEGY: none
-    {{distro.name.upper()}}_VERSION: '{{version}}'
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/{{distro.name}}/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
     FDO_DISTRIBUTION_VERSION: '{{version}}'
     FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG