1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

gitlab-ci: Update Fedora to version 36

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed May 18 07:56:52 UTC 2022 on sn-devel-184
This commit is contained in:
Andreas Schneider 2022-05-17 10:08:35 +02:00 committed by Andreas Schneider
parent 00e31d9d06
commit 91d8bc7ac2
13 changed files with 32 additions and 32 deletions

View File

@ -42,7 +42,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt # Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render # which is generated by bootstrap/template.py --render
# #
SAMBA_CI_CONTAINER_TAG: a4bf899c9709c67254c5bb3964e3dce6bb2e4d1e SAMBA_CI_CONTAINER_TAG: a6e30c371ba434b89af5628bd1974e5cc947eb9f
# #
# We use the ubuntu1804 image as default as # We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184. # it matches what we have on sn-devel-184.
@ -57,8 +57,8 @@ variables:
SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004 SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004
SAMBA_CI_CONTAINER_IMAGE_debian11: debian11 SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
SAMBA_CI_CONTAINER_IMAGE_opensuse153: opensuse153 SAMBA_CI_CONTAINER_IMAGE_opensuse153: opensuse153
SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35 SAMBA_CI_CONTAINER_IMAGE_fedora36: fedora36
SAMBA_CI_CONTAINER_IMAGE_f35mit120: f35mit120 SAMBA_CI_CONTAINER_IMAGE_f36mit120: f36mit120
SAMBA_CI_CONTAINER_IMAGE_centos7: centos7 SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s
@ -255,20 +255,20 @@ samba-def-build:
samba-mit-build: samba-mit-build:
extends: .shared_template_build_only extends: .shared_template_build_only
variables: variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35} SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
stage: build_first stage: build_first
samba-mit120-build: samba-mit120-build:
extends: .shared_template_build_only extends: .shared_template_build_only
variables: variables:
AUTOBUILD_JOB_NAME: samba-mit-build AUTOBUILD_JOB_NAME: samba-mit-build
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f35mit120} SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f36mit120}
stage: build_first stage: build_first
.needs_samba-mit-build: .needs_samba-mit-build:
extends: .shared_template_test_only extends: .shared_template_test_only
variables: variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35} SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
needs: needs:
- job: samba-mit-build - job: samba-mit-build
artifacts: true artifacts: true
@ -276,7 +276,7 @@ samba-mit120-build:
.needs_samba-mit120-build: .needs_samba-mit120-build:
extends: .shared_template_test_only extends: .shared_template_test_only
variables: variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f35mit120} SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f36mit120}
needs: needs:
- job: samba-mit120-build - job: samba-mit120-build
artifacts: true artifacts: true
@ -323,7 +323,7 @@ samba:
samba-mitkrb5: samba-mitkrb5:
extends: .shared_template extends: .shared_template
variables: variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35} SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
samba-minimal-smbd: samba-minimal-smbd:
extends: .shared_template extends: .shared_template
@ -392,7 +392,7 @@ samba-addc-mit-4b:
samba-fips: samba-fips:
extends: .shared_template extends: .shared_template
variables: variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35} SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
.private_test_only: .private_test_only:
extends: .private_runner_test extends: .private_runner_test
@ -634,10 +634,10 @@ centos8s-samba-o3:
variables: variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s} SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s}
fedora35-samba-o3: fedora36-samba-o3:
extends: .samba-o3-template extends: .samba-o3-template
variables: variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35} SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
# #
# Keep the samba-o3 sections at the end ... # Keep the samba-o3 sections at the end ...

View File

@ -97,10 +97,10 @@ ubuntu2004:
debian11: debian11:
extends: .build_image_template extends: .build_image_template
fedora35: fedora36:
extends: .build_image_template extends: .build_image_template
f35mit120: f36mit120:
extends: .build_image_template extends: .build_image_template
centos8s: centos8s:

View File

@ -488,9 +488,9 @@ RPM_DISTS = {
'mold': '', 'mold': '',
} }
}, },
'fedora35': { 'fedora36': {
'docker_image': 'fedora:35', 'docker_image': 'fedora:36',
'vagrant_box': 'fedora/35-cloud-base', 'vagrant_box': 'fedora/36-cloud-base',
'bootstrap': DNF_BOOTSTRAP, 'bootstrap': DNF_BOOTSTRAP,
'replace': { 'replace': {
'lsb-release': 'redhat-lsb', 'lsb-release': 'redhat-lsb',
@ -499,9 +499,9 @@ RPM_DISTS = {
'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
} }
}, },
'f35mit120': { 'f36mit120': {
'docker_image': 'fedora:35', 'docker_image': 'fedora:36',
'vagrant_box': 'fedora/35-cloud-base', 'vagrant_box': 'fedora/36-cloud-base',
'bootstrap': DNF_BOOTSTRAP_MIT, 'bootstrap': DNF_BOOTSTRAP_MIT,
'replace': { 'replace': {
'lsb-release': 'redhat-lsb', 'lsb-release': 'redhat-lsb',

View File

@ -31,18 +31,18 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "debian11/locale.sh" v.vm.provision :shell, path: "debian11/locale.sh"
end end
config.vm.define "f35mit120" do |v| config.vm.define "f36mit120" do |v|
v.vm.box = "fedora/35-cloud-base" v.vm.box = "fedora/36-cloud-base"
v.vm.hostname = "f35mit120" v.vm.hostname = "f36mit120"
v.vm.provision :shell, path: "f35mit120/bootstrap.sh" v.vm.provision :shell, path: "f36mit120/bootstrap.sh"
v.vm.provision :shell, path: "f35mit120/locale.sh" v.vm.provision :shell, path: "f36mit120/locale.sh"
end end
config.vm.define "fedora35" do |v| config.vm.define "fedora36" do |v|
v.vm.box = "fedora/35-cloud-base" v.vm.box = "fedora/36-cloud-base"
v.vm.hostname = "fedora35" v.vm.hostname = "fedora36"
v.vm.provision :shell, path: "fedora35/bootstrap.sh" v.vm.provision :shell, path: "fedora36/bootstrap.sh"
v.vm.provision :shell, path: "fedora35/locale.sh" v.vm.provision :shell, path: "fedora36/locale.sh"
end end
config.vm.define "opensuse153" do |v| config.vm.define "opensuse153" do |v|

View File

@ -3,7 +3,7 @@
# See also bootstrap/config.py # See also bootstrap/config.py
# #
FROM fedora:35 FROM fedora:36
# pass in with --build-arg while build # pass in with --build-arg while build
ARG SHA1SUM ARG SHA1SUM

View File

@ -3,7 +3,7 @@
# See also bootstrap/config.py # See also bootstrap/config.py
# #
FROM fedora:35 FROM fedora:36
# pass in with --build-arg while build # pass in with --build-arg while build
ARG SHA1SUM ARG SHA1SUM

View File

@ -1 +1 @@
a4bf899c9709c67254c5bb3964e3dce6bb2e4d1e a6e30c371ba434b89af5628bd1974e5cc947eb9f