diff options
| -rw-r--r-- | .gitlab-ci.yml | 38 | ||||
| -rw-r--r-- | .gitlab-ci/gitlab-ci.tmpl | 20 |
2 files changed, 29 insertions, 29 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa2d353..5d09e96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,13 +62,13 @@ variables: # changing these will force rebuilding the associated image # Note: these tags have no meaning and are not tied to a particular # libevdev version - FEDORA_TAG: '2020-02-25.0' - CENTOS_TAG: '2020-02-25.0' - DEBIAN_TAG: '2020-02-25.0' - UBUNTU_TAG: '2020-02-25.0' - ARCH_TAG: '2020-02-25.0' - ALPINE_TAG: '2020-02-25.0' - QEMU_TAG: 'qemu-2020-02-25.0' + FEDORA_TAG: '2020-02-26.4' + CENTOS_TAG: '2020-02-26.4' + DEBIAN_TAG: '2020-02-26.4' + UBUNTU_TAG: '2020-02-26.4' + ARCH_TAG: '2020-02-26.4' + ALPINE_TAG: '2020-02-26.4' + QEMU_TAG: 'qemu-2020-02-26.4' UPSTREAM_REPO: libevdev/libevdev BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest @@ -161,7 +161,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 @@ -186,7 +186,7 @@ fedora:31@qemu-prep: GIT_STRATEGY: none FEDORA_VERSION: 31 FEDORA_TAG: $QEMU_TAG - DISTRIB_FLAVOR: fedora + DISTRIB_NAME: fedora DISTRIB_VERSION: $FEDORA_VERSION TAG: $QEMU_TAG allow_failure: true @@ -201,7 +201,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 @@ -215,7 +215,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 @@ -229,7 +229,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 @@ -243,7 +243,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 @@ -257,7 +257,7 @@ debian:stable@container-prep: variables: GIT_STRATEGY: none DEBIAN_VERSION: 'stable' - DISTRIB_FLAVOR: debian + DISTRIB_NAME: debian DISTRIB_VERSION: $DEBIAN_VERSION TAG: $DEBIAN_TAG @@ -271,7 +271,7 @@ debian:sid@container-prep: variables: GIT_STRATEGY: none DEBIAN_VERSION: 'sid' - DISTRIB_FLAVOR: debian + DISTRIB_NAME: debian DISTRIB_VERSION: $DEBIAN_VERSION TAG: $DEBIAN_TAG @@ -285,7 +285,7 @@ centos:7@container-prep: variables: GIT_STRATEGY: none CENTOS_VERSION: '7' - DISTRIB_FLAVOR: centos + DISTRIB_NAME: centos DISTRIB_VERSION: $CENTOS_VERSION TAG: $CENTOS_TAG @@ -299,7 +299,7 @@ centos:8@container-prep: variables: GIT_STRATEGY: none CENTOS_VERSION: '8' - DISTRIB_FLAVOR: centos + DISTRIB_NAME: centos DISTRIB_VERSION: $CENTOS_VERSION TAG: $CENTOS_TAG @@ -313,7 +313,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 @@ -327,7 +327,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 diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl index c4583dd..829193a 100644 --- a/.gitlab-ci/gitlab-ci.tmpl +++ b/.gitlab-ci/gitlab-ci.tmpl @@ -46,13 +46,13 @@ variables: # changing these will force rebuilding the associated image # Note: these tags have no meaning and are not tied to a particular # libevdev version - FEDORA_TAG: '2020-02-25.0' - CENTOS_TAG: '2020-02-25.0' - DEBIAN_TAG: '2020-02-25.0' - UBUNTU_TAG: '2020-02-25.0' - ARCH_TAG: '2020-02-25.0' - ALPINE_TAG: '2020-02-25.0' - QEMU_TAG: 'qemu-2020-02-25.0' + FEDORA_TAG: '2020-02-26.4' + CENTOS_TAG: '2020-02-26.4' + DEBIAN_TAG: '2020-02-26.4' + UBUNTU_TAG: '2020-02-26.4' + ARCH_TAG: '2020-02-26.4' + ALPINE_TAG: '2020-02-26.4' + QEMU_TAG: 'qemu-2020-02-26.4' UPSTREAM_REPO: libevdev/libevdev BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest @@ -145,7 +145,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 @@ -170,7 +170,7 @@ fedora:31@qemu-prep: GIT_STRATEGY: none FEDORA_VERSION: 31 FEDORA_TAG: $QEMU_TAG - DISTRIB_FLAVOR: fedora + DISTRIB_NAME: fedora DISTRIB_VERSION: $FEDORA_VERSION TAG: $QEMU_TAG allow_failure: true @@ -186,7 +186,7 @@ fedora:31@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 |