Skip to content

Commit b54fa4f

Browse files
balasankarcRobert Marshall
balasankarc
authored and
Robert Marshall
committed
Update CI jobs to use the new runners
- Changes tags used to identify runners to allow migration to the new fleet. Signed-off-by: Balasankar "Balu" C <[email protected]>
1 parent 72fb694 commit b54fa4f

File tree

4 files changed

+94
-122
lines changed

4 files changed

+94
-122
lines changed

‎.gitlab-ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,18 @@ variables:
7171
DEV_PROJECT_PATH: 'gitlab/omnibus-gitlab'
7272
QA_PROJECT_PATH: 'gitlab-org/build/omnibus-gitlab-mirror'
7373

74+
.distribution-amd64-tags:
75+
- distribution-runner
76+
- amd64
77+
78+
.distribution-arm64-tags:
79+
- distribution-runner
80+
- arm64
81+
82+
.distribution-armhf-tags:
83+
- distribution-runner
84+
- armhf
85+
7486
### For services that need a docker daemon
7587
.docker_job: &docker_job
7688
image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"

‎gitlab-ci-config/check-packages.yml

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,18 @@ variables:
1515
rules:
1616
- if: '$CI_COMMIT_TAG =~ /^.*ce\.\d.*$/'
1717

18+
.distribution-amd64-tags:
19+
- distribution-runner
20+
- amd64
21+
22+
.distribution-arm64-tags:
23+
- distribution-runner
24+
- arm64
25+
26+
.distribution-armhf-tags:
27+
- distribution-runner
28+
- armhf
29+
1830
before_script:
1931
- bash scripts/ci/prepare_bundle.sh
2032

@@ -43,6 +55,7 @@ before_script:
4355
script:
4456
- !reference [.common_install_scripts, script]
4557
- apt install -y ${package_name_version_dist} || (echo "Failed to install ${package_name_version_dist}" && exit 1)
58+
tags: !reference [.distribution-amd64-tags]
4659

4760
.yum-install: &yum-install
4861
stage: package
@@ -51,6 +64,7 @@ before_script:
5164
script:
5265
- !reference [.common_install_scripts, script]
5366
- yum install -y ${package_name_version_dist} || (echo "Failed to install ${package_name_version_dist}" && exit 1)
67+
tags: !reference [.distribution-amd64-tags]
5468

5569
.zypper-install: &zypper-install
5670
stage: package
@@ -59,6 +73,19 @@ before_script:
5973
script:
6074
- !reference [.common_install_scripts, script]
6175
- zypper install -y ${package_name_version_dist} || (echo "Failed to install ${package_name_version_dist}" && exit 1)
76+
tags: !reference [.distribution-amd64-tags]
77+
78+
.apt-arm-install: &apt-arm-install
79+
extends: .apt-install
80+
tags: !reference [.distribution-arm64-tags]
81+
82+
.yum-arm-install: &yum-arm-install
83+
extends: .yum-install
84+
tags: !reference [.distribution-arm64-tags]
85+
86+
.zypper-arm-install: &zypper-arm-install
87+
extends: .zypper-install
88+
tags: !reference [.distribution-arm64-tags]
6289

6390
# apt based
6491
Ubuntu-18.04-check:
@@ -69,59 +96,47 @@ Ubuntu-20.04-check:
6996
extends: .apt-install
7097
Ubuntu-20.04-arm64-check:
7198
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04_arm64:${BUILDER_IMAGE_REVISION}"
72-
extends: .apt-install
73-
tags:
74-
- docker-arm-builder
99+
extends: .apt-arm-install
75100
Ubuntu-22.04-check:
76101
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
77102
extends: .apt-install
78103
Ubuntu-22.04-arm64-check:
79104
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04_arm64:${BUILDER_IMAGE_REVISION}"
80-
extends: .apt-install
81-
tags:
82-
- docker-arm-builder
105+
extends: .apt-arm-install
83106
Debian-10-check:
84107
image: "${BUILDER_IMAGE_REGISTRY}/debian_10:${BUILDER_IMAGE_REVISION}"
85108
extends: .apt-install
86109
Debian-10-arm64-check:
87110
image: "${BUILDER_IMAGE_REGISTRY}/debian_10_arm64:${BUILDER_IMAGE_REVISION}"
88-
extends: .apt-install
89-
tags:
90-
- docker-arm-builder
111+
extends: .apt-arm-install
91112
Debian-11-check:
92113
image: "${BUILDER_IMAGE_REGISTRY}/debian_11:${BUILDER_IMAGE_REVISION}"
93114
extends: .apt-install
94115
Debian-11-arm64-check:
95116
image: "${BUILDER_IMAGE_REGISTRY}/debian_11_arm64:${BUILDER_IMAGE_REVISION}"
96-
extends: .apt-install
97-
tags:
98-
- docker-arm-builder
117+
extends: .apt-arm-install
99118
Debian-12-check:
100119
image: "${BUILDER_IMAGE_REGISTRY}/debian_12:${BUILDER_IMAGE_REVISION}"
101120
extends: .apt-install
102121
Debian-12-arm64-check:
103122
image: "${BUILDER_IMAGE_REGISTRY}/debian_12_arm64:${BUILDER_IMAGE_REVISION}"
104-
extends: .apt-install
105-
tags:
106-
- docker-arm-builder
123+
extends: .apt-arm-install
107124
Raspberry-Pi-2-Buster-check:
108125
image: "${BUILDER_IMAGE_REGISTRY}/rpi_10:${BUILDER_IMAGE_REVISION}"
109126
extends:
110127
- .apt-install
111128
- .ce-tag-only
112129
variables:
113130
package_repository: 'raspberry-pi2'
114-
tags:
115-
- docker-arm-builder
131+
tags: !reference [.distribution-armhf-tags]
116132
Raspberry-Pi-2-Bullseye-check:
117133
image: "${BUILDER_IMAGE_REGISTRY}/rpi_11:${BUILDER_IMAGE_REVISION}"
118134
extends:
119135
- .apt-install
120136
- .ce-tag-only
121137
variables:
122138
package_repository: 'raspberry-pi2'
123-
tags:
124-
- docker-arm-builder
139+
tags: !reference [.distribution-armhf-tags]
125140
Ubuntu-18.04-fips-check:
126141
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04_fips:${BUILDER_IMAGE_REVISION}"
127142
extends:
@@ -146,33 +161,25 @@ AlmaLinux-8-check:
146161
extends: .yum-install
147162
AlmaLinux-8-arm64-check:
148163
image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_arm64:${BUILDER_IMAGE_REVISION}"
149-
extends: .yum-install
150-
tags:
151-
- docker-arm-builder
164+
extends: .yum-arm-install
152165
AlmaLinux-9-check:
153166
image: "${BUILDER_IMAGE_REGISTRY}/almalinux_9:${BUILDER_IMAGE_REVISION}"
154167
extends: .yum-install
155168
AlmaLinux-9-arm64-check:
156169
image: "${BUILDER_IMAGE_REGISTRY}/almalinux_9_arm64:${BUILDER_IMAGE_REVISION}"
157-
extends: .yum-install
158-
tags:
159-
- docker-arm-builder
170+
extends: .yum-arm-install
160171
AmazonLinux-2-check:
161172
image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2:${BUILDER_IMAGE_REVISION}"
162173
extends: .yum-install
163174
AmazonLinux-2-arm64-check:
164175
image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2_arm64:${BUILDER_IMAGE_REVISION}"
165-
extends: .yum-install
166-
tags:
167-
- docker-arm-builder
176+
extends: .yum-arm-install
168177
AmazonLinux-2023-check:
169178
image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2023:${BUILDER_IMAGE_REVISION}"
170179
extends: .yum-install
171180
AmazonLinux-2023-arm64-check:
172181
image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2023_arm64:${BUILDER_IMAGE_REVISION}"
173-
extends: .yum-install
174-
tags:
175-
- docker-arm-builder
182+
extends: .yum-arm-install
176183
AlmaLinux-8-fips-check:
177184
image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
178185
extends:
@@ -194,9 +201,7 @@ OpenSUSE-15.4-check:
194201
extends: .zypper-install
195202
OpenSUSE-15.4-arm64-check:
196203
image: "${BUILDER_IMAGE_REGISTRY}/opensuse_15.4_arm64:${BUILDER_IMAGE_REVISION}"
197-
extends: .zypper-install
198-
tags:
199-
- docker-arm-builder
204+
extends: .zypper-arm-install
200205
SLES-12.5-check:
201206
image: "${DEV_BUILDER_IMAGE_REGISTRY}/sles_12sp5:${BUILDER_IMAGE_REVISION}"
202207
extends:

0 commit comments

Comments
 (0)