Skip to content
Snippets Groups Projects
Commit 65617578aeb3 authored by Robert Marshall's avatar Robert Marshall
Browse files
No related branches found
No related tags found
1 merge request!143Merge upstream Omnibus GitLab up to the 17.1 branching point
......@@ -46,6 +46,9 @@
elsif ohai['platform'] == 'amazon' && ohai['platform_version'] == '2'
env['CC'] = "/usr/bin/gcc10-gcc"
env['CXX'] = "/usr/bin/gcc10-g++"
elsif ohai['platform'] == 'ubuntu' && ohai['platform_version'].start_with?('24.')
env['CC'] = "/usr/bin/gcc-10"
env['CXX'] = "/usr/bin/g++-10"
end
end
......
......@@ -103,6 +103,12 @@
Ubuntu-22.04-arm64-check:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04_arm64:${BUILDER_IMAGE_REVISION}"
extends: .apt-arm-install
Ubuntu-24.04-check:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_24.04:${BUILDER_IMAGE_REVISION}"
extends: .apt-install
Ubuntu-24.04-arm64-check:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_24.04_arm64:${BUILDER_IMAGE_REVISION}"
extends: .apt-arm-install
Debian-10-check:
image: "${BUILDER_IMAGE_REGISTRY}/debian_10:${BUILDER_IMAGE_REVISION}"
extends: .apt-install
......
......@@ -283,6 +283,10 @@
- if: '$PIPELINE_TYPE =~ /TRIGGERED_(CE|EE)_PIPELINE/'
- if: '$PIPELINE_TYPE == "TRIGGER_CACHE_UPDATE_PIPELINE"'
Ubuntu-24.04-branch:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_24.04:${BUILDER_IMAGE_REVISION}"
extends: .branch_template
Debian-10-branch:
image: "${BUILDER_IMAGE_REGISTRY}/debian_10:${BUILDER_IMAGE_REVISION}"
extends: .branch_template
......@@ -315,6 +319,9 @@
# automatic job
when: manual
allow_failure: true
Ubuntu-24.04-arm64-branch:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_24.04_arm64:${BUILDER_IMAGE_REVISION}"
extends: .arm64_branch_template
CentOS-7-branch:
image: "${BUILDER_IMAGE_REGISTRY}/centos_7:${BUILDER_IMAGE_REVISION}"
extends: .branch_template
......@@ -558,9 +565,12 @@
Debian-12-arm64:
image: "${BUILDER_IMAGE_REGISTRY}/debian_12_arm64:${BUILDER_IMAGE_REVISION}"
extends: .arm64_tag_template
Ubuntu-24.04:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_24.04:${BUILDER_IMAGE_REVISION}"
extends: .tag_template
Ubuntu-20.04-arm64:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04_arm64:${BUILDER_IMAGE_REVISION}"
extends: .arm64_tag_template
Ubuntu-22.04-arm64:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04_arm64:${BUILDER_IMAGE_REVISION}"
extends: .arm64_tag_template
......@@ -561,9 +571,12 @@
Ubuntu-20.04-arm64:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04_arm64:${BUILDER_IMAGE_REVISION}"
extends: .arm64_tag_template
Ubuntu-22.04-arm64:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04_arm64:${BUILDER_IMAGE_REVISION}"
extends: .arm64_tag_template
Ubuntu-24.04-arm64:
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_24.04_arm64:${BUILDER_IMAGE_REVISION}"
extends: .arm64_tag_template
CentOS-7:
image: "${BUILDER_IMAGE_REGISTRY}/centos_7:${BUILDER_IMAGE_REVISION}"
extends: .tag_template
......@@ -681,6 +694,13 @@
optional: true
- job: Debian-12-arm64-branch
optional: true
Ubuntu-24.04-staging:
extends: .staging_upload_template
needs:
- job: Ubuntu-24.04
optional: true
- job: Ubuntu-24.04-branch
optional: true
Ubuntu-20.04-arm64-staging:
extends: .staging_upload_template
needs:
......@@ -688,6 +708,13 @@
optional: true
- job: Ubuntu-20.04-arm64-branch
optional: true
Ubuntu-24.04-arm64-staging:
extends: .staging_upload_template
needs:
- job: Ubuntu-24.04-arm64
optional: true
- job: Ubuntu-24.04-arm64-branch
optional: true
CentOS-7-staging:
extends: .staging_upload_template
needs:
......@@ -816,6 +843,10 @@
extends: .production_release_template
needs:
- Ubuntu-22.04
Ubuntu-24.04-release:
extends: .production_release_template
needs:
- Ubuntu-24.04
Ubuntu-20.04-arm64-release:
extends: .production_release_template
needs:
......@@ -824,6 +855,10 @@
extends: .production_release_template
needs:
- Ubuntu-22.04-arm64
Ubuntu-24.04-arm64-release:
extends: .production_release_template
needs:
- Ubuntu-24.04-arm64
Debian-10-release:
extends: .production_release_template
needs:
......
......@@ -349,6 +349,7 @@
OpenSUSE 15.5 knapsack: !reference [.knapsack]
Ubuntu 20.04 knapsack: !reference [.knapsack]
Ubuntu 22.04 knapsack: !reference [.knapsack]
Ubuntu 24.04 knapsack: !reference [.knapsack]
AmazonLinux 2 knapsack: !reference [.knapsack]
AmazonLinux 2023 knapsack: !reference [.knapsack]
......@@ -379,6 +380,12 @@
parallel: 6
needs:
- Ubuntu 22.04 knapsack
Ubuntu 24.04 specs:
image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/ubuntu_24.04-ruby:${BUILDER_IMAGE_REVISION}"
extends: .chef_spec_template
parallel: 6
needs:
- Ubuntu 24.04 knapsack
Debian 10 specs :
image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/debian_10-ruby:${BUILDER_IMAGE_REVISION}"
extends: .chef_spec_template
......
......@@ -65,6 +65,8 @@
'focal'
when /^22\.04/
'jammy'
when /^24\.04/
'noble'
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment