Skip to content

Commit 3ae5872

Browse files
balasankarcRobert Marshall
authored andcommitted
Stop building and using Ubuntu 16.04 packages
- Do not build Ubuntu 16.04 packages - Remove or modify remaining jobs that use Ubuntu 16.04 Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6211 Signed-off-by: Balasankar "Balu" C <[email protected]>
1 parent a9e0e5f commit 3ae5872

File tree

2 files changed

+5
-38
lines changed

2 files changed

+5
-38
lines changed

gitlab-ci-config/dev-gitlab-org.yml

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
### 2. Always ran on dev.gitlab.org
155155
.staging_upload_template: &staging_upload
156156
stage: staging_upload
157-
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
157+
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
158158
variables:
159159
INCLUDE_PACKAGECLOUD: "true"
160160
script:
@@ -191,7 +191,7 @@
191191
### 3. Only ran on dev.gitlab.org
192192
.production_release_template: &production_release
193193
stage: package-and-image-release
194-
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
194+
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
195195
variables:
196196
INCLUDE_PACKAGECLOUD: "true"
197197
script:
@@ -272,11 +272,6 @@
272272
# fetch-assets job from .gitlab-ci.yml file runs here
273273
# generate-assets job from .gitlab-ci.yml file runs here
274274

275-
# We build package for deploying to GitLab.com first
276-
Ubuntu-16.04-branch:
277-
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
278-
extends: .branch_template
279-
280275
Ubuntu-18.04-branch:
281276
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04:${BUILDER_IMAGE_REVISION}"
282277
extends: .branch_template
@@ -452,7 +447,7 @@ Raspberry-Pi-2-Bullseye-branch:
452447
# This job runs only on nightly EE builds
453448
RAT-Nightly:
454449
stage: slow_jobs
455-
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
450+
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
456451
script:
457452
- bundle exec rake qa:rat:nightly
458453
cache: !reference [.branch-cache]
@@ -486,16 +481,6 @@ RAT-Nightly-FIPS:
486481

487482
# fetch-assets job from .gitlab-ci.yml file runs here
488483

489-
# We build package for deploying to GitLab.com first
490-
Ubuntu-16.04:
491-
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
492-
stage: package
493-
extends: .tag_template
494-
rules:
495-
- !reference [.default_rules, rules]
496-
# Also build for auto-deploy tags
497-
- if: '$PIPELINE_TYPE =~ /(_RC|_TAG|AUTO_DEPLOY)_BUILD_PIPELINE$/'
498-
499484
Ubuntu-18.04:
500485
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04:${BUILDER_IMAGE_REVISION}"
501486
stage: package
@@ -555,22 +540,11 @@ Docker-QA:
555540
## not auto-deploys are deployed to
556541
## $PATCH_DEPLOY_ENVIRONMENT, set in CI vars
557542
##
558-
## Ubuntu 16.04: used for all omnibus installation
543+
## Ubuntu 22.04: used for all omnibus installation
559544
## Ubuntu 18.04: used on some non-omnibus infrastructure, we
560545
## will eventually need to trigger deployments
561546
## after this package is built
562547

563-
Ubuntu-16.04-upload-deploy:
564-
extends: .staging_upload_with_deployment_template
565-
needs:
566-
- job: Ubuntu-16.04
567-
optional: true
568-
- job: Ubuntu-16.04-branch
569-
optional: true
570-
rules:
571-
- !reference [.default_rules, rules]
572-
- if: '$PIPELINE_TYPE =~ /(_RC|_TAG|AUTO_DEPLOY|NIGHTLY)_BUILD_PIPELINE$/'
573-
574548
Ubuntu-18.04-staging:
575549
extends: .staging_upload_with_deployment_template
576550
needs:
@@ -1114,7 +1088,7 @@ manifest-upload:
11141088

11151089
RAT-Tag:
11161090
stage: slow_jobs
1117-
image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
1091+
image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
11181092
script:
11191093
- bundle exec rake qa:rat:tag
11201094
cache: !reference [.tag-cache]

gitlab-ci-config/gitlab-com.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,6 @@ AlmaLinux 9 knapsack: !reference [.knapsack]
397397
Debian 10 knapsack: !reference [.knapsack]
398398
Debian 11 knapsack: !reference [.knapsack]
399399
OpenSUSE 15.4 knapsack: !reference [.knapsack]
400-
Ubuntu 16.04 knapsack: !reference [.knapsack]
401400
Ubuntu 18.04 knapsack: !reference [.knapsack]
402401
Ubuntu 20.04 knapsack: !reference [.knapsack]
403402
Ubuntu 22.04 knapsack: !reference [.knapsack]
@@ -419,12 +418,6 @@ build library specs:
419418
coverage_format: cobertura
420419
path: coverage/coverage.xml
421420

422-
Ubuntu 16.04 specs:
423-
image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/ubuntu_16.04-ruby:${BUILDER_IMAGE_REVISION}"
424-
extends: .chef_spec_template
425-
parallel: 6
426-
needs:
427-
- Ubuntu 16.04 knapsack
428421
Ubuntu 18.04 specs :
429422
image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/ubuntu_18.04-ruby:${BUILDER_IMAGE_REVISION}"
430423
extends: .chef_spec_template

0 commit comments

Comments
 (0)