sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

ci: Drop distro version from image name

Browse source 
We are unlikely to ever use multiple fedora versions, so all the
versioned name does is being annoying when updating to a newer
base image.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2430>
This commit is contained in:
Florian Müllner 2022-05-27 20:02:41 +02:00 committed by Marge Bot
parent d371c18035
commit c6dc12cdc5
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
.gitlab-ci.yml
View file

@ -15,7 +15,7 @@ stages:
variables: variables:
FDO_UPSTREAM_REPO: GNOME/mutter FDO_UPSTREAM_REPO: GNOME/mutter
.mutter.fedora:35@common: .mutter.fedora@common:
variables: variables:
FDO_DISTRIBUTION_VERSION: 35 FDO_DISTRIBUTION_VERSION: 35
BASE_TAG: '2022-08-02.0' BASE_TAG: '2022-08-02.0'
@ -132,13 +132,13 @@ default:
- 'scheduler_failure' - 'scheduler_failure'
- 'api_failure' - 'api_failure'
.mutter.fedora:35@x86_64: .mutter.fedora@x86_64:
extends: .mutter.fedora:35@common extends: .mutter.fedora@common
variables: variables:
FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}" FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
.mutter.fedora:35@aarch64: .mutter.fedora@aarch64:
extends: .mutter.fedora:35@common extends: .mutter.fedora@common
variables: variables:
FDO_DISTRIBUTION_TAG: "aarch64-${BASE_TAG}" FDO_DISTRIBUTION_TAG: "aarch64-${BASE_TAG}"
tags: tags:
@ -219,7 +219,7 @@ check-merge-request:
build-fedora-container@x86_64: build-fedora-container@x86_64:
extends: extends:
- .fdo.container-build@fedora@x86_64 - .fdo.container-build@fedora@x86_64
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
stage: prepare stage: prepare
needs: needs:
- check-commit-log - check-commit-log
@ -230,7 +230,7 @@ build-fedora-container@x86_64:
build-fedora-container@aarch64: build-fedora-container@aarch64:
extends: extends:
- .fdo.container-build@fedora@aarch64 - .fdo.container-build@fedora@aarch64
- .mutter.fedora:35@aarch64 - .mutter.fedora@aarch64
stage: prepare stage: prepare
needs: needs:
- check-commit-log - check-commit-log
@ -241,7 +241,7 @@ build-fedora-container@aarch64:
check-code-style: check-code-style:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
stage: code-review stage: code-review
needs: needs:
- build-fedora-container@x86_64 - build-fedora-container@x86_64
@ -292,21 +292,21 @@ build-mutter@x86_64:
-Dkvm_kernel_image=/opt/mutter/bzImage -Dkvm_kernel_image=/opt/mutter/bzImage
extends: extends:
- .build-mutter - .build-mutter
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
needs: needs:
- build-fedora-container@x86_64 - build-fedora-container@x86_64
build-mutter@aarch64: build-mutter@aarch64:
extends: extends:
- .build-mutter - .build-mutter
- .mutter.fedora:35@aarch64 - .mutter.fedora@aarch64
needs: needs:
- build-fedora-container@aarch64 - build-fedora-container@aarch64
build-without-opengl-and-glx@x86_64: build-without-opengl-and-glx@x86_64:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
stage: build stage: build
needs: needs:
- build-fedora-container@x86_64 - build-fedora-container@x86_64
@ -326,7 +326,7 @@ build-without-opengl-and-glx@x86_64:
build-without-native-backend-and-wayland@x86_64: build-without-native-backend-and-wayland@x86_64:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
stage: build stage: build
needs: needs:
- build-fedora-container@x86_64 - build-fedora-container@x86_64
@ -398,14 +398,14 @@ build-without-native-backend-and-wayland@x86_64:
test-mutter@x86_64: test-mutter@x86_64:
extends: extends:
- .test-mutter - .test-mutter
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
needs: needs:
- build-mutter@x86_64 - build-mutter@x86_64
test-mutter-kvm@x86_64: test-mutter-kvm@x86_64:
extends: extends:
- .test-mutter-base - .test-mutter-base
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
tags: tags:
- kvm - kvm
script: script:
@ -423,14 +423,14 @@ test-mutter-kvm@x86_64:
test-mutter@aarch64: test-mutter@aarch64:
extends: extends:
- .test-mutter - .test-mutter
- .mutter.fedora:35@aarch64 - .mutter.fedora@aarch64
needs: needs:
- build-mutter@aarch64 - build-mutter@aarch64
coverage: coverage:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
stage: analyze stage: analyze
script: script:
- mkdir coveragereport - mkdir coveragereport
@ -448,7 +448,7 @@ coverage:
can-build-gnome-shell@x86_64: can-build-gnome-shell@x86_64:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
stage: test stage: test
needs: needs:
- build-mutter@x86_64 - build-mutter@x86_64
@ -467,7 +467,7 @@ test-mutter-coverity:
when: 'manual' when: 'manual'
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
needs: needs:
- build-fedora-container@x86_64 - build-fedora-container@x86_64
stage: analyze stage: analyze
@ -489,7 +489,7 @@ test-mutter-coverity:
dist-mutter: dist-mutter:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
- .build-mutter-base - .build-mutter-base
<<: *test-setup <<: *test-setup
stage: deploy stage: deploy
@ -521,7 +521,7 @@ dist-mutter-tarball:
reference: reference:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .mutter.fedora:35@x86_64 - .mutter.fedora@x86_64
stage: docs stage: docs
needs: needs:
- job: build-fedora-container@x86_64 - job: build-fedora-container@x86_64