diff options
author | Andreas Schneider <asn@samba.org> | 2021-05-06 15:24:06 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2021-05-07 07:18:01 +0000 |
commit | ac78b921dafa3372eee747caabd094fb5a05cf6b (patch) | |
tree | fa74f2a501e60513c2ecba32e84e89a173b38f7f /bootstrap | |
parent | 755566566440a4432db09e7cdc1733eb43354095 (diff) | |
download | samba-ac78b921dafa3372eee747caabd094fb5a05cf6b.tar.gz |
bootstrap: Add Fedora 34 CI runner
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri May 7 07:18:02 UTC 2021 on sn-devel-184
Diffstat (limited to 'bootstrap')
-rw-r--r-- | bootstrap/.gitlab-ci.yml | 4 | ||||
-rw-r--r-- | bootstrap/config.py | 14 | ||||
-rw-r--r-- | bootstrap/generated-dists/Vagrantfile | 14 | ||||
-rw-r--r-- | bootstrap/generated-dists/fedora34/Dockerfile (renamed from bootstrap/generated-dists/fedora32/Dockerfile) | 2 | ||||
-rwxr-xr-x | bootstrap/generated-dists/fedora34/bootstrap.sh (renamed from bootstrap/generated-dists/fedora32/bootstrap.sh) | 0 | ||||
-rwxr-xr-x | bootstrap/generated-dists/fedora34/locale.sh (renamed from bootstrap/generated-dists/fedora32/locale.sh) | 0 | ||||
-rw-r--r-- | bootstrap/generated-dists/fedora34/packages.yml (renamed from bootstrap/generated-dists/fedora32/packages.yml) | 0 | ||||
-rw-r--r-- | bootstrap/sha1sum.txt | 2 |
8 files changed, 18 insertions, 18 deletions
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index 1a8376daa4c..5e5856b1e90 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -103,10 +103,10 @@ ubuntu2004: debian10: extends: .build_image_template -fedora32: +fedora33: extends: .build_image_template -fedora33: +fedora34: extends: .build_image_template centos8: diff --git a/bootstrap/config.py b/bootstrap/config.py index 39e1fafdeea..bfd5b947d07 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -472,25 +472,25 @@ RPM_DISTS = { 'liburing-devel': '', # not available yet, Add me back, once available! } }, - 'fedora32': { - 'docker_image': 'fedora:32', - 'vagrant_box': 'fedora/32-cloud-base', + 'fedora33': { + 'docker_image': 'fedora:33', + 'vagrant_box': 'fedora/33-cloud-base', 'bootstrap': DNF_BOOTSTRAP, 'replace': { 'lsb-release': 'redhat-lsb', 'libsemanage-python': 'python3-libsemanage', 'policycoreutils-python': 'python3-policycoreutils', - 'perl-FindBin': '', } }, - 'fedora33': { - 'docker_image': 'fedora:33', - 'vagrant_box': 'fedora/33-cloud-base', + 'fedora34': { + 'docker_image': 'fedora:34', + 'vagrant_box': 'fedora/34-cloud-base', 'bootstrap': DNF_BOOTSTRAP, 'replace': { 'lsb-release': 'redhat-lsb', 'libsemanage-python': 'python3-libsemanage', 'policycoreutils-python': 'python3-policycoreutils', + 'perl-FindBin': '', } }, 'opensuse151': { diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index 042e45238d3..42da0161e40 100644 --- a/bootstrap/generated-dists/Vagrantfile +++ b/bootstrap/generated-dists/Vagrantfile @@ -31,13 +31,6 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "debian10/locale.sh" end - config.vm.define "fedora32" do |v| - v.vm.box = "fedora/32-cloud-base" - v.vm.hostname = "fedora32" - v.vm.provision :shell, path: "fedora32/bootstrap.sh" - v.vm.provision :shell, path: "fedora32/locale.sh" - end - config.vm.define "fedora33" do |v| v.vm.box = "fedora/33-cloud-base" v.vm.hostname = "fedora33" @@ -45,6 +38,13 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "fedora33/locale.sh" end + config.vm.define "fedora34" do |v| + v.vm.box = "fedora/34-cloud-base" + v.vm.hostname = "fedora34" + v.vm.provision :shell, path: "fedora34/bootstrap.sh" + v.vm.provision :shell, path: "fedora34/locale.sh" + end + config.vm.define "opensuse151" do |v| v.vm.box = "opensuse/openSUSE-15.1-x86_64" v.vm.hostname = "opensuse151" diff --git a/bootstrap/generated-dists/fedora32/Dockerfile b/bootstrap/generated-dists/fedora34/Dockerfile index d8a75cf8445..0ce89448a5f 100644 --- a/bootstrap/generated-dists/fedora32/Dockerfile +++ b/bootstrap/generated-dists/fedora34/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM fedora:32 +FROM fedora:34 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/fedora32/bootstrap.sh b/bootstrap/generated-dists/fedora34/bootstrap.sh index 104aaa6c444..104aaa6c444 100755 --- a/bootstrap/generated-dists/fedora32/bootstrap.sh +++ b/bootstrap/generated-dists/fedora34/bootstrap.sh diff --git a/bootstrap/generated-dists/fedora32/locale.sh b/bootstrap/generated-dists/fedora34/locale.sh index cc64e180483..cc64e180483 100755 --- a/bootstrap/generated-dists/fedora32/locale.sh +++ b/bootstrap/generated-dists/fedora34/locale.sh diff --git a/bootstrap/generated-dists/fedora32/packages.yml b/bootstrap/generated-dists/fedora34/packages.yml index a5b4e3dd544..a5b4e3dd544 100644 --- a/bootstrap/generated-dists/fedora32/packages.yml +++ b/bootstrap/generated-dists/fedora34/packages.yml diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 186035eb906..e2800636e59 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -d6f5c29855b1bf8173d2e75668487c49c7ee75ac +66bfd3037078ebaa3395adfd563e8cc78d49d4d3 |