Commit f657d834 authored by Peter Hutterer's avatar Peter Hutterer

gitlab CI: drop the distribution "flavor" in favor of using the name

Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent ebfb1e77
Pipeline #114123 passed with stages
in 25 minutes and 18 seconds
......@@ -77,12 +77,12 @@ variables:
# changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular
# libinput version
FEDORA_TAG: '2019-12-24.0'
UBUNTU_TAG: '2019-12-24.0'
ARCH_TAG: '2019-12-24.0'
ALPINE_TAG: '2019-12-24.0'
FREEBSD_TAG: '2019-12-24.0'
QEMU_TAG: 'qemu-vm-2020-02-24.0'
FEDORA_TAG: '2020-02-26.0'
UBUNTU_TAG: '2020-02-26.0'
ARCH_TAG: '2020-02-26.0'
ALPINE_TAG: '2020-02-26.0'
FREEBSD_TAG: '2020-02-26.0'
QEMU_TAG: 'qemu-vm-2020-02-26.0'
UBUNTU_EXEC: "bash .gitlab-ci/ubuntu_install.sh $UBUNTU_CUSTOM_DEBS"
......@@ -181,7 +181,7 @@ check-commit:
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# get the full container image name (DISTRIB_VERSION still has indirections)
- IMAGE=$(eval echo "$DISTRIB_FLAVOR/$DISTRIB_VERSION:$TAG")
- IMAGE=$(eval echo "$DISTRIB_NAME/$DISTRIB_VERSION:$TAG")
# force rebuild if schedule, reuse otherwise
- if [[ $CI_PIPELINE_SOURCE == "schedule" ]] ; then touch .scheduled; fi
......@@ -206,7 +206,7 @@ fedora:30@qemu-prep:
FEDORA_VERSION: 30
FEDORA_TAG: $QEMU_TAG
FEDORA_RPMS: $FEDORA_QEMU_RPMS
DISTRIB_FLAVOR: fedora
DISTRIB_NAME: fedora
DISTRIB_VERSION: $FEDORA_VERSION
TAG: $QEMU_TAG
allow_failure: true
......@@ -220,7 +220,7 @@ fedora:30@container-prep:
variables:
GIT_STRATEGY: none
FEDORA_VERSION: '30'
DISTRIB_FLAVOR: fedora
DISTRIB_NAME: fedora
DISTRIB_VERSION: $FEDORA_VERSION
TAG: $FEDORA_TAG
......@@ -233,7 +233,7 @@ fedora:31@container-prep:
variables:
GIT_STRATEGY: none
FEDORA_VERSION: '31'
DISTRIB_FLAVOR: fedora
DISTRIB_NAME: fedora
DISTRIB_VERSION: $FEDORA_VERSION
TAG: $FEDORA_TAG
......@@ -246,7 +246,7 @@ ubuntu:19.10@container-prep:
variables:
GIT_STRATEGY: none
UBUNTU_VERSION: '19.10'
DISTRIB_FLAVOR: ubuntu
DISTRIB_NAME: ubuntu
DISTRIB_VERSION: $UBUNTU_VERSION
TAG: $UBUNTU_TAG
......@@ -259,7 +259,7 @@ ubuntu:19.04@container-prep:
variables:
GIT_STRATEGY: none
UBUNTU_VERSION: '19.04'
DISTRIB_FLAVOR: ubuntu
DISTRIB_NAME: ubuntu
DISTRIB_VERSION: $UBUNTU_VERSION
TAG: $UBUNTU_TAG
......@@ -272,7 +272,7 @@ arch:rolling@container-prep:
variables:
GIT_STRATEGY: none
ARCH_VERSION: 'rolling'
DISTRIB_FLAVOR: arch
DISTRIB_NAME: arch
DISTRIB_VERSION: $ARCH_VERSION
TAG: $ARCH_TAG
......@@ -285,7 +285,7 @@ alpine:latest@container-prep:
variables:
GIT_STRATEGY: none
ALPINE_VERSION: 'latest'
DISTRIB_FLAVOR: alpine
DISTRIB_NAME: alpine
DISTRIB_VERSION: $ALPINE_VERSION
TAG: $ALPINE_TAG
......@@ -321,7 +321,7 @@ freebsd:11.2@container-prep:
variables:
GIT_STRATEGY: none
FREEBSD_VERSION: "11.2"
DISTRIB_FLAVOR: freebsd
DISTRIB_NAME: freebsd
DISTRIB_VERSION: $FREEBSD_VERSION
TAG: $FREEBSD_TAG
......
......@@ -67,12 +67,12 @@ variables:
# changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular
# libinput version
FEDORA_TAG: '2019-12-24.0'
UBUNTU_TAG: '2019-12-24.0'
ARCH_TAG: '2019-12-24.0'
ALPINE_TAG: '2019-12-24.0'
FREEBSD_TAG: '2019-12-24.0'
QEMU_TAG: 'qemu-vm-2020-02-24.0'
FEDORA_TAG: '2020-02-26.0'
UBUNTU_TAG: '2020-02-26.0'
ARCH_TAG: '2020-02-26.0'
ALPINE_TAG: '2020-02-26.0'
FREEBSD_TAG: '2020-02-26.0'
QEMU_TAG: 'qemu-vm-2020-02-26.0'
UBUNTU_EXEC: "bash .gitlab-ci/ubuntu_install.sh $UBUNTU_CUSTOM_DEBS"
......@@ -171,7 +171,7 @@ check-commit:
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# get the full container image name (DISTRIB_VERSION still has indirections)
- IMAGE=$(eval echo "$DISTRIB_FLAVOR/$DISTRIB_VERSION:$TAG")
- IMAGE=$(eval echo "$DISTRIB_NAME/$DISTRIB_VERSION:$TAG")
# force rebuild if schedule, reuse otherwise
- if [[ $CI_PIPELINE_SOURCE == "schedule" ]] ; then touch .scheduled; fi
......@@ -196,7 +196,7 @@ fedora:30@qemu-prep:
FEDORA_VERSION: 30
FEDORA_TAG: $QEMU_TAG
FEDORA_RPMS: $FEDORA_QEMU_RPMS
DISTRIB_FLAVOR: fedora
DISTRIB_NAME: fedora
DISTRIB_VERSION: $FEDORA_VERSION
TAG: $QEMU_TAG
allow_failure: true
......@@ -211,7 +211,7 @@ fedora:30@qemu-prep:
variables:
GIT_STRATEGY: none
{{distro.name.upper()}}_VERSION: '{{distro.version}}'
DISTRIB_FLAVOR: {{distro.name}}
DISTRIB_NAME: {{distro.name}}
DISTRIB_VERSION: ${{distro.name.upper()}}_VERSION
TAG: ${{distro.name.upper()}}_TAG
......@@ -248,7 +248,7 @@ freebsd:11.2@container-prep:
variables:
GIT_STRATEGY: none
FREEBSD_VERSION: "11.2"
DISTRIB_FLAVOR: freebsd
DISTRIB_NAME: freebsd
DISTRIB_VERSION: $FREEBSD_VERSION
TAG: $FREEBSD_TAG
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment