From 3144d3afe532488ed38d88a7efa11b6fe0f4075b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 30 Oct 2020 10:38:47 +1000
Subject: [PATCH] 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>
---
 .gitlab-ci.yml         | 5 -----
 .gitlab-ci/ci.template | 1 -
 2 files changed, 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f6598d0..04882d7a 100644
--- 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 821f39d7..756669e4 100644
--- 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
-- 
2.34.1