diff options
15 files changed, 43 insertions, 49 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index cc48ec12a64..2fea7ef2eff 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -42,7 +42,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: dd885c72c8615e2d6166a04f3709d9ceaa728f84 + SAMBA_CI_CONTAINER_TAG: 791e89a43f2b287635e128c8f5aed924b757c4bd # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. @@ -61,8 +61,8 @@ variables: SAMBA_CI_CONTAINER_IMAGE_debian11: debian11 SAMBA_CI_CONTAINER_IMAGE_opensuse151: opensuse151 SAMBA_CI_CONTAINER_IMAGE_opensuse152: opensuse152 - SAMBA_CI_CONTAINER_IMAGE_fedora33: fedora33 SAMBA_CI_CONTAINER_IMAGE_fedora34: fedora34 + SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35 SAMBA_CI_CONTAINER_IMAGE_centos7: centos7 SAMBA_CI_CONTAINER_IMAGE_centos8: centos8 @@ -253,13 +253,13 @@ samba-def-build: samba-mit-build: extends: .shared_template_build_only variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35} stage: build_first .needs_samba-mit-build: extends: .shared_template_test_only variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35} needs: - job: samba-mit-build artifacts: true @@ -297,7 +297,7 @@ samba: samba-mitkrb5: extends: .shared_template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35} samba-minimal-smbd: extends: .shared_template @@ -366,7 +366,7 @@ samba-addc-mit-4b: samba-fips: extends: .shared_template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35} .private_test_only: extends: .private_runner_test @@ -488,7 +488,7 @@ pages: coverity: extends: .shared_runner_build_image variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35} stage: build script: - wget https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_PROJECT_NAME" -O /tmp/coverity_tool.tgz @@ -599,15 +599,15 @@ centos8-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8} -fedora33-samba-o3: +fedora34-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora33} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34} -fedora34-samba-o3: +fedora35-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35} # # Keep the samba-o3 sections at the end ... diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index 01da6106b53..f3ec2e98dff 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -100,10 +100,10 @@ debian10: debian11: extends: .build_image_template -fedora33: +fedora34: extends: .build_image_template -fedora34: +fedora35: extends: .build_image_template centos8: diff --git a/bootstrap/config.py b/bootstrap/config.py index 2cf754782a1..d9943dd515a 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -145,8 +145,8 @@ PKGS = [ ('python3-pyasn1', 'python3-pyasn1'), # for krb5 tests ('python3-setproctitle', 'python3-setproctitle'), - ('', 'libsemanage-python'), - ('', 'policycoreutils-python'), + ('', 'python3-libsemanage'), + ('', 'python3-policycoreutils'), # perl ('libparse-yapp-perl', 'perl-Parse-Yapp'), @@ -467,37 +467,33 @@ RPM_DISTS = { 'replace': { 'lsb-release': 'redhat-lsb', '@development-tools': '"@Development Tools"', # add quotes - 'libsemanage-python': 'python3-libsemanage', 'lcov': '', # does not exist 'perl-JSON-Parse': '', # does not exist? 'perl-Test-Base': 'perl-Test-Simple', 'perl-FindBin': '', - 'policycoreutils-python': 'python3-policycoreutils', 'liburing-devel': '', # not available yet, Add me back, once available! } }, - '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': '', 'python3-iso8601': 'python3-dateutil', + 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available } }, - 'fedora34': { - 'docker_image': 'fedora:34', - 'vagrant_box': 'fedora/34-cloud-base', + 'fedora35': { + 'docker_image': 'fedora:35', + 'vagrant_box': 'fedora/35-cloud-base', 'bootstrap': DNF_BOOTSTRAP, 'replace': { 'lsb-release': 'redhat-lsb', - 'libsemanage-python': 'python3-libsemanage', - 'policycoreutils-python': 'python3-policycoreutils', 'perl-FindBin': '', 'python3-iso8601': 'python3-dateutil', - 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available + 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available } }, 'opensuse151': { @@ -514,7 +510,7 @@ RPM_DISTS = { 'jansson-devel': 'libjansson-devel', 'keyutils-libs-devel': 'keyutils-devel', 'krb5-workstation': 'krb5-client', - 'libsemanage-python': 'python2-semanage', + 'python3-libsemanage': 'python2-semanage', 'openldap-devel': 'openldap2-devel', 'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper', 'perl-JSON-Parse': 'perl-JSON-XS', @@ -545,7 +541,7 @@ RPM_DISTS = { 'jansson-devel': 'libjansson-devel', 'keyutils-libs-devel': 'keyutils-devel', 'krb5-workstation': 'krb5-client', - 'libsemanage-python': 'python2-semanage', + 'python3-libsemanage': 'python2-semanage', 'openldap-devel': 'openldap2-devel', 'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper', 'perl-JSON-Parse': 'perl-JSON-XS', diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index 358d8e23d59..6d29c774cc9 100644 --- a/bootstrap/generated-dists/Vagrantfile +++ b/bootstrap/generated-dists/Vagrantfile @@ -38,13 +38,6 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "debian11/locale.sh" end - config.vm.define "fedora33" do |v| - v.vm.box = "fedora/33-cloud-base" - v.vm.hostname = "fedora33" - v.vm.provision :shell, path: "fedora33/bootstrap.sh" - 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" @@ -52,6 +45,13 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "fedora34/locale.sh" end + config.vm.define "fedora35" do |v| + v.vm.box = "fedora/35-cloud-base" + v.vm.hostname = "fedora35" + v.vm.provision :shell, path: "fedora35/bootstrap.sh" + v.vm.provision :shell, path: "fedora35/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/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh index 36913f40b44..c31137e75c2 100755 --- a/bootstrap/generated-dists/centos7/bootstrap.sh +++ b/bootstrap/generated-dists/centos7/bootstrap.sh @@ -55,7 +55,6 @@ yum install -y \ libcap-devel \ libicu-devel \ libpcap-devel \ - libsemanage-python \ libtasn1-devel \ libtasn1-tools \ libtirpc-devel \ @@ -80,10 +79,11 @@ yum install -y \ perl-generators \ perl-interpreter \ pkgconfig \ - policycoreutils-python \ popt-devel \ procps-ng \ psmisc \ + python3-libsemanage \ + python3-policycoreutils \ python36 \ python36-cryptography \ python36-devel \ diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml index 4da3d61441f..eebeb2feaa3 100644 --- a/bootstrap/generated-dists/centos7/packages.yml +++ b/bootstrap/generated-dists/centos7/packages.yml @@ -41,7 +41,6 @@ packages: - libcap-devel - libicu-devel - libpcap-devel - - libsemanage-python - libtasn1-devel - libtasn1-tools - libtirpc-devel @@ -66,10 +65,11 @@ packages: - perl-generators - perl-interpreter - pkgconfig - - policycoreutils-python - popt-devel - procps-ng - psmisc + - python3-libsemanage + - python3-policycoreutils - python36 - python36-cryptography - python36-devel diff --git a/bootstrap/generated-dists/fedora33/Dockerfile b/bootstrap/generated-dists/fedora35/Dockerfile index c4632344a09..c9aa524b831 100644 --- a/bootstrap/generated-dists/fedora33/Dockerfile +++ b/bootstrap/generated-dists/fedora35/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM fedora:33 +FROM fedora:35 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/fedora33/bootstrap.sh b/bootstrap/generated-dists/fedora35/bootstrap.sh index 52e199f6b88..de5a9670601 100755 --- a/bootstrap/generated-dists/fedora33/bootstrap.sh +++ b/bootstrap/generated-dists/fedora35/bootstrap.sh @@ -74,7 +74,6 @@ dnf install -y \ perl \ perl-Archive-Tar \ perl-ExtUtils-MakeMaker \ - perl-FindBin \ perl-JSON \ perl-JSON-Parse \ perl-Parse-Yapp \ diff --git a/bootstrap/generated-dists/fedora33/locale.sh b/bootstrap/generated-dists/fedora35/locale.sh index cc64e180483..cc64e180483 100755 --- a/bootstrap/generated-dists/fedora33/locale.sh +++ b/bootstrap/generated-dists/fedora35/locale.sh diff --git a/bootstrap/generated-dists/fedora33/packages.yml b/bootstrap/generated-dists/fedora35/packages.yml index d9cbfbd80db..749f30dfc0e 100644 --- a/bootstrap/generated-dists/fedora33/packages.yml +++ b/bootstrap/generated-dists/fedora35/packages.yml @@ -63,7 +63,6 @@ packages: - perl - perl-Archive-Tar - perl-ExtUtils-MakeMaker - - perl-FindBin - perl-JSON - perl-JSON-Parse - perl-Parse-Yapp diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh index e4771284f4d..02c8c5d9633 100755 --- a/bootstrap/generated-dists/opensuse151/bootstrap.sh +++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh @@ -75,7 +75,6 @@ zypper --non-interactive install \ perl-Parse-Yapp \ perl-Test-Base \ pkgconfig \ - policycoreutils-python \ popt-devel \ procps \ psmisc \ @@ -87,6 +86,7 @@ zypper --non-interactive install \ python3-dnspython \ python3-gpg \ python3-iso8601 \ + python3-policycoreutils \ python3-pyasn1 \ python3-setproctitle \ readline-devel \ diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml index d465252e26b..843e4c57e17 100644 --- a/bootstrap/generated-dists/opensuse151/packages.yml +++ b/bootstrap/generated-dists/opensuse151/packages.yml @@ -63,7 +63,6 @@ packages: - perl-Parse-Yapp - perl-Test-Base - pkgconfig - - policycoreutils-python - popt-devel - procps - psmisc @@ -75,6 +74,7 @@ packages: - python3-dnspython - python3-gpg - python3-iso8601 + - python3-policycoreutils - python3-pyasn1 - python3-setproctitle - readline-devel diff --git a/bootstrap/generated-dists/opensuse152/bootstrap.sh b/bootstrap/generated-dists/opensuse152/bootstrap.sh index 534ff66896f..ffef2d9cd2a 100755 --- a/bootstrap/generated-dists/opensuse152/bootstrap.sh +++ b/bootstrap/generated-dists/opensuse152/bootstrap.sh @@ -77,7 +77,6 @@ zypper --non-interactive install \ perl-Parse-Yapp \ perl-Test-Base \ pkgconfig \ - policycoreutils-python \ popt-devel \ procps \ psmisc \ @@ -88,6 +87,7 @@ zypper --non-interactive install \ python3-devel \ python3-dnspython \ python3-gpg \ + python3-policycoreutils \ python3-pyasn1 \ python3-python-dateutil \ python3-setproctitle \ diff --git a/bootstrap/generated-dists/opensuse152/packages.yml b/bootstrap/generated-dists/opensuse152/packages.yml index 05b3779a2fd..8198464c43d 100644 --- a/bootstrap/generated-dists/opensuse152/packages.yml +++ b/bootstrap/generated-dists/opensuse152/packages.yml @@ -65,7 +65,6 @@ packages: - perl-Parse-Yapp - perl-Test-Base - pkgconfig - - policycoreutils-python - popt-devel - procps - psmisc @@ -76,6 +75,7 @@ packages: - python3-devel - python3-dnspython - python3-gpg + - python3-policycoreutils - python3-pyasn1 - python3-python-dateutil - python3-setproctitle diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 60a3cced99c..a4a0de426b1 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -dd885c72c8615e2d6166a04f3709d9ceaa728f84 +791e89a43f2b287635e128c8f5aed924b757c4bd |