[gnome-build-meta/abderrahim/arch-indep: 4/4] .gitlab-ci: mark jobs that don't need a specific arch as such
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/arch-indep: 4/4] .gitlab-ci: mark jobs that don't need a specific arch as such
- Date: Tue, 25 Jan 2022 16:05:41 +0000 (UTC)
commit 97e2ffb83fbe41802aceb8b8c76e9d6953b99356
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Fri Jan 21 16:32:58 2022 +0100
.gitlab-ci: mark jobs that don't need a specific arch as such
This allows running them on the aarch64 runner if x86_64 is busy
.gitlab-ci.yml | 6 +++---
.gitlab-ci/arch.yml | 4 ++++
.gitlab-ci/flat-manager.yml | 6 +++---
3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 137246d26..f1dd14cbf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,7 +118,7 @@ default:
#
track:
- extends: .x86_64
+ extends: .arch-indep
stage: track
interruptible: true
script:
@@ -153,7 +153,7 @@ build-aarch64:
generate-deploy-config:
extends:
- - .x86_64
+ - .arch-indep
- .deploy-rules
needs:
- job: 'track'
@@ -356,7 +356,7 @@ openh264-x86_64:
s3-image-static:
- extends: .x86_64
+ extends: .arch-indep
stage: reports
needs:
- job: s3-image
diff --git a/.gitlab-ci/arch.yml b/.gitlab-ci/arch.yml
index 7441f3b1d..543a800fb 100644
--- a/.gitlab-ci/arch.yml
+++ b/.gitlab-ci/arch.yml
@@ -22,3 +22,7 @@
- gnome-build-meta
variables:
ARCH: aarch64
+
+.arch-indep:
+ tags:
+ - gnome-build-meta
diff --git a/.gitlab-ci/flat-manager.yml b/.gitlab-ci/flat-manager.yml
index 28bccfb3d..dffec8558 100644
--- a/.gitlab-ci/flat-manager.yml
+++ b/.gitlab-ci/flat-manager.yml
@@ -45,7 +45,7 @@ default:
flatmgr-prepare:
- extends: .x86_64
+ extends: .arch-indep
stage: prepare
script:
- test -n "$TRACK_JOB_ID" && curl -O $CI_PROJECT_URL/-/jobs/$TRACK_JOB_ID/artifacts/raw/project.refs
@@ -59,7 +59,7 @@ flatmgr-prepare:
action: prepare
flatmgr-finish:
- extends: .x86_64
+ extends: .arch-indep
stage: finish
dependencies: [flatmgr-prepare]
script:
@@ -71,7 +71,7 @@ flatmgr-finish:
name: $ENVIRONMENT_NAME
flatmgr-finish-failed:
- extends: .x86_64
+ extends: .arch-indep
stage: finish
dependencies: [flatmgr-prepare]
script:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]