|
154 | 154 | ### 2. Always ran on dev.gitlab.org
|
155 | 155 | .staging_upload_template: &staging_upload
|
156 | 156 | 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}" |
158 | 158 | variables:
|
159 | 159 | INCLUDE_PACKAGECLOUD: "true"
|
160 | 160 | script:
|
|
191 | 191 | ### 3. Only ran on dev.gitlab.org
|
192 | 192 | .production_release_template: &production_release
|
193 | 193 | 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}" |
195 | 195 | variables:
|
196 | 196 | INCLUDE_PACKAGECLOUD: "true"
|
197 | 197 | script:
|
|
272 | 272 | # fetch-assets job from .gitlab-ci.yml file runs here
|
273 | 273 | # generate-assets job from .gitlab-ci.yml file runs here
|
274 | 274 |
|
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 |
| - |
280 | 275 | Ubuntu-18.04-branch:
|
281 | 276 | image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04:${BUILDER_IMAGE_REVISION}"
|
282 | 277 | extends: .branch_template
|
@@ -452,7 +447,7 @@ Raspberry-Pi-2-Bullseye-branch:
|
452 | 447 | # This job runs only on nightly EE builds
|
453 | 448 | RAT-Nightly:
|
454 | 449 | 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}" |
456 | 451 | script:
|
457 | 452 | - bundle exec rake qa:rat:nightly
|
458 | 453 | cache: !reference [.branch-cache]
|
@@ -486,16 +481,6 @@ RAT-Nightly-FIPS:
|
486 | 481 |
|
487 | 482 | # fetch-assets job from .gitlab-ci.yml file runs here
|
488 | 483 |
|
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 |
| - |
499 | 484 | Ubuntu-18.04:
|
500 | 485 | image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04:${BUILDER_IMAGE_REVISION}"
|
501 | 486 | stage: package
|
@@ -555,22 +540,11 @@ Docker-QA:
|
555 | 540 | ## not auto-deploys are deployed to
|
556 | 541 | ## $PATCH_DEPLOY_ENVIRONMENT, set in CI vars
|
557 | 542 | ##
|
558 |
| -## Ubuntu 16.04: used for all omnibus installation |
| 543 | +## Ubuntu 22.04: used for all omnibus installation |
559 | 544 | ## Ubuntu 18.04: used on some non-omnibus infrastructure, we
|
560 | 545 | ## will eventually need to trigger deployments
|
561 | 546 | ## after this package is built
|
562 | 547 |
|
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 |
| - |
574 | 548 | Ubuntu-18.04-staging:
|
575 | 549 | extends: .staging_upload_with_deployment_template
|
576 | 550 | needs:
|
@@ -1114,7 +1088,7 @@ manifest-upload:
|
1114 | 1088 |
|
1115 | 1089 | RAT-Tag:
|
1116 | 1090 | 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}" |
1118 | 1092 | script:
|
1119 | 1093 | - bundle exec rake qa:rat:tag
|
1120 | 1094 | cache: !reference [.tag-cache]
|
|
0 commit comments