diff options
author | Andreas Schneider <asn@samba.org> | 2022-11-16 09:37:16 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2022-11-16 16:29:30 +0000 |
commit | ebaafb2375c3866d6ba1e178a2e2f5623f6212c8 (patch) | |
tree | 2677aeb1f96916665eaeb5996523ea040c717173 /bootstrap | |
parent | 7cb50405515298b75dcc512633fb3877045aabc6 (diff) | |
download | samba-ebaafb2375c3866d6ba1e178a2e2f5623f6212c8.tar.gz |
gitlab-ci: Update Fedora to version 37
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 Nov 16 16:29:30 UTC 2022 on sn-devel-184
Diffstat (limited to 'bootstrap')
-rw-r--r-- | bootstrap/.gitlab-ci.yml | 6 | ||||
-rw-r--r-- | bootstrap/config.py | 12 | ||||
-rw-r--r-- | bootstrap/generated-dists/Vagrantfile | 20 | ||||
-rw-r--r-- | bootstrap/generated-dists/f37mit120/Dockerfile (renamed from bootstrap/generated-dists/f36mit120/Dockerfile) | 2 | ||||
-rwxr-xr-x | bootstrap/generated-dists/f37mit120/bootstrap.sh (renamed from bootstrap/generated-dists/f36mit120/bootstrap.sh) | 0 | ||||
-rwxr-xr-x | bootstrap/generated-dists/f37mit120/locale.sh (renamed from bootstrap/generated-dists/f36mit120/locale.sh) | 0 | ||||
-rw-r--r-- | bootstrap/generated-dists/f37mit120/packages.yml (renamed from bootstrap/generated-dists/f36mit120/packages.yml) | 0 | ||||
-rw-r--r-- | bootstrap/generated-dists/fedora37/Dockerfile (renamed from bootstrap/generated-dists/fedora36/Dockerfile) | 2 | ||||
-rwxr-xr-x | bootstrap/generated-dists/fedora37/bootstrap.sh (renamed from bootstrap/generated-dists/fedora36/bootstrap.sh) | 0 | ||||
-rwxr-xr-x | bootstrap/generated-dists/fedora37/locale.sh (renamed from bootstrap/generated-dists/fedora36/locale.sh) | 0 | ||||
-rw-r--r-- | bootstrap/generated-dists/fedora37/packages.yml (renamed from bootstrap/generated-dists/fedora36/packages.yml) | 0 | ||||
-rw-r--r-- | bootstrap/sha1sum.txt | 2 |
12 files changed, 22 insertions, 22 deletions
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index a9777348334..dff5cd2bf94 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -1,4 +1,4 @@ - +--- .build_image_template: image: quay.io/podman/stable:latest stage: images @@ -97,10 +97,10 @@ ubuntu2004: debian11: extends: .build_image_template -fedora36: +fedora37: extends: .build_image_template -f36mit120: +f37mit120: extends: .build_image_template centos8s: diff --git a/bootstrap/config.py b/bootstrap/config.py index 9546db1fb28..048f256ef2e 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -495,9 +495,9 @@ RPM_DISTS = { 'shfmt': '', } }, - 'fedora36': { - 'docker_image': 'quay.io/fedora/fedora:36', - 'vagrant_box': 'fedora/36-cloud-base', + 'fedora37': { + 'docker_image': 'quay.io/fedora/fedora:37', + 'vagrant_box': 'fedora/37-cloud-base', 'bootstrap': DNF_BOOTSTRAP, 'replace': { 'lsb-release': 'redhat-lsb', @@ -506,9 +506,9 @@ RPM_DISTS = { 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available } }, - 'f36mit120': { - 'docker_image': 'quay.io/fedora/fedora:36', - 'vagrant_box': 'fedora/36-cloud-base', + 'f37mit120': { + 'docker_image': 'quay.io/fedora/fedora:37', + 'vagrant_box': 'fedora/37-cloud-base', 'bootstrap': DNF_BOOTSTRAP_MIT, 'replace': { 'lsb-release': 'redhat-lsb', diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index 28f8f89b7d9..dad82c1e502 100644 --- a/bootstrap/generated-dists/Vagrantfile +++ b/bootstrap/generated-dists/Vagrantfile @@ -31,18 +31,18 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "debian11/locale.sh" end - config.vm.define "f36mit120" do |v| - v.vm.box = "fedora/36-cloud-base" - v.vm.hostname = "f36mit120" - v.vm.provision :shell, path: "f36mit120/bootstrap.sh" - v.vm.provision :shell, path: "f36mit120/locale.sh" + config.vm.define "f37mit120" do |v| + v.vm.box = "fedora/37-cloud-base" + v.vm.hostname = "f37mit120" + v.vm.provision :shell, path: "f37mit120/bootstrap.sh" + v.vm.provision :shell, path: "f37mit120/locale.sh" end - config.vm.define "fedora36" do |v| - v.vm.box = "fedora/36-cloud-base" - v.vm.hostname = "fedora36" - v.vm.provision :shell, path: "fedora36/bootstrap.sh" - v.vm.provision :shell, path: "fedora36/locale.sh" + config.vm.define "fedora37" do |v| + v.vm.box = "fedora/37-cloud-base" + v.vm.hostname = "fedora37" + v.vm.provision :shell, path: "fedora37/bootstrap.sh" + v.vm.provision :shell, path: "fedora37/locale.sh" end config.vm.define "opensuse154" do |v| diff --git a/bootstrap/generated-dists/f36mit120/Dockerfile b/bootstrap/generated-dists/f37mit120/Dockerfile index 8ceb585b6fd..6e4c2cfd8fb 100644 --- a/bootstrap/generated-dists/f36mit120/Dockerfile +++ b/bootstrap/generated-dists/f37mit120/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM quay.io/fedora/fedora:36 +FROM quay.io/fedora/fedora:37 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/f36mit120/bootstrap.sh b/bootstrap/generated-dists/f37mit120/bootstrap.sh index c46dcf0d705..c46dcf0d705 100755 --- a/bootstrap/generated-dists/f36mit120/bootstrap.sh +++ b/bootstrap/generated-dists/f37mit120/bootstrap.sh diff --git a/bootstrap/generated-dists/f36mit120/locale.sh b/bootstrap/generated-dists/f37mit120/locale.sh index cc64e180483..cc64e180483 100755 --- a/bootstrap/generated-dists/f36mit120/locale.sh +++ b/bootstrap/generated-dists/f37mit120/locale.sh diff --git a/bootstrap/generated-dists/f36mit120/packages.yml b/bootstrap/generated-dists/f37mit120/packages.yml index d1e9af5af3d..d1e9af5af3d 100644 --- a/bootstrap/generated-dists/f36mit120/packages.yml +++ b/bootstrap/generated-dists/f37mit120/packages.yml diff --git a/bootstrap/generated-dists/fedora36/Dockerfile b/bootstrap/generated-dists/fedora37/Dockerfile index 8ceb585b6fd..6e4c2cfd8fb 100644 --- a/bootstrap/generated-dists/fedora36/Dockerfile +++ b/bootstrap/generated-dists/fedora37/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM quay.io/fedora/fedora:36 +FROM quay.io/fedora/fedora:37 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/fedora36/bootstrap.sh b/bootstrap/generated-dists/fedora37/bootstrap.sh index 6cbde6f3411..6cbde6f3411 100755 --- a/bootstrap/generated-dists/fedora36/bootstrap.sh +++ b/bootstrap/generated-dists/fedora37/bootstrap.sh diff --git a/bootstrap/generated-dists/fedora36/locale.sh b/bootstrap/generated-dists/fedora37/locale.sh index cc64e180483..cc64e180483 100755 --- a/bootstrap/generated-dists/fedora36/locale.sh +++ b/bootstrap/generated-dists/fedora37/locale.sh diff --git a/bootstrap/generated-dists/fedora36/packages.yml b/bootstrap/generated-dists/fedora37/packages.yml index d1e9af5af3d..d1e9af5af3d 100644 --- a/bootstrap/generated-dists/fedora36/packages.yml +++ b/bootstrap/generated-dists/fedora37/packages.yml diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index b87fad087bb..9d2e589a876 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -afb5d32dfeebf0f100bdf9073f0c802d051ec15e +e3639b136a9b626936e849fb2976ebeed7e4fd3b |