From b1426d0657c1c550d368fb35406e57f7bc58995d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 17 Apr 2019 08:54:52 +0200 Subject: [PATCH] gitlab-ci: Enable fedora29 and update generated dists Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Apr 25 11:46:23 UTC 2019 on sn-devel-184 --- .gitlab-ci.yml | 7 ++++++- bootstrap/.gitlab-ci.yml | 2 +- bootstrap/generated-dists/centos6/bootstrap.sh | 1 + bootstrap/generated-dists/centos6/packages.yml | 1 + bootstrap/generated-dists/centos7/bootstrap.sh | 1 + bootstrap/generated-dists/centos7/packages.yml | 1 + bootstrap/generated-dists/debian7/bootstrap.sh | 3 +++ bootstrap/generated-dists/debian7/packages.yml | 3 +++ bootstrap/generated-dists/debian8/bootstrap.sh | 3 +++ bootstrap/generated-dists/debian8/packages.yml | 3 +++ bootstrap/generated-dists/debian9/bootstrap.sh | 3 +++ bootstrap/generated-dists/debian9/packages.yml | 3 +++ bootstrap/generated-dists/fedora28/bootstrap.sh | 9 +++++++-- bootstrap/generated-dists/fedora28/packages.yml | 5 +++++ bootstrap/generated-dists/fedora29/bootstrap.sh | 9 +++++++-- bootstrap/generated-dists/fedora29/packages.yml | 5 +++++ bootstrap/generated-dists/opensuse150/bootstrap.sh | 4 ++++ bootstrap/generated-dists/opensuse150/packages.yml | 4 ++++ bootstrap/generated-dists/ubuntu1404/bootstrap.sh | 1 + bootstrap/generated-dists/ubuntu1404/packages.yml | 1 + bootstrap/generated-dists/ubuntu1604/bootstrap.sh | 1 + bootstrap/generated-dists/ubuntu1604/packages.yml | 1 + bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 3 +++ bootstrap/generated-dists/ubuntu1804/packages.yml | 3 +++ bootstrap/sha1sum.txt | 2 +- 25 files changed, 72 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e43000548ca..82d8859e30d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 5c2b831fb6aef8abd25dbdc6ade53ba2ebad1a1c + SAMBA_CI_CONTAINER_TAG: 735b9b509e6928bc71fe4442798e4fe110a98788 # # The following images are available # Please see the samba-o3 sections at the end of this file! @@ -30,6 +30,7 @@ variables: SAMBA_CI_CONTAINER_IMAGE_ubuntu1404: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1404:${SAMBA_CI_CONTAINER_TAG} SAMBA_CI_CONTAINER_IMAGE_debian9: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian9:${SAMBA_CI_CONTAINER_TAG} SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG} + SAMBA_CI_CONTAINER_IMAGE_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG} include: # The image creation details are specified in a separate file @@ -205,6 +206,10 @@ opensuse150-samba-o3: extends: .samba-o3-template image: $SAMBA_CI_CONTAINER_IMAGE_opensuse150 +fedora29-samba-o3: + extends: .samba-o3-template + image: $SAMBA_CI_CONTAINER_IMAGE_fedora29 + # # Keep the samba-o3 sections at the end ... # diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index f6bbd9e0285..515b6ac66db 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -101,7 +101,7 @@ debian7: extends: .build_image_template_force_broken fedora29: - extends: .build_image_template_force_broken + extends: .build_image_template fedora28: extends: .build_image_template_force_broken diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh index be21d8bec69..fdd04385a02 100755 --- a/bootstrap/generated-dists/centos6/bootstrap.sh +++ b/bootstrap/generated-dists/centos6/bootstrap.sh @@ -99,6 +99,7 @@ yum -y -q --verbose install \ tar \ tree \ which \ + xfsprogs-devel \ yum-utils \ zlib-devel diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml index c7953bd60f9..307d31826e6 100644 --- a/bootstrap/generated-dists/centos6/packages.yml +++ b/bootstrap/generated-dists/centos6/packages.yml @@ -87,5 +87,6 @@ packages: - tar - tree - which + - xfsprogs-devel - yum-utils - zlib-devel \ No newline at end of file diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh index 08a11b7ee93..122025df729 100755 --- a/bootstrap/generated-dists/centos7/bootstrap.sh +++ b/bootstrap/generated-dists/centos7/bootstrap.sh @@ -99,6 +99,7 @@ yum -y -q --verbose install \ tar \ tree \ which \ + xfsprogs-devel \ yum-utils \ zlib-devel diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml index c3bbe7ba4a6..93aa4db8a11 100644 --- a/bootstrap/generated-dists/centos7/packages.yml +++ b/bootstrap/generated-dists/centos7/packages.yml @@ -87,5 +87,6 @@ packages: - tar - tree - which + - xfsprogs-devel - yum-utils - zlib-devel \ No newline at end of file diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh index a860caf330e..a5cb63ace15 100755 --- a/bootstrap/generated-dists/debian7/bootstrap.sh +++ b/bootstrap/generated-dists/debian7/bootstrap.sh @@ -28,6 +28,7 @@ apt-get -y install \ gcc \ gdb \ git \ + glusterfs-common \ gzip \ hostname \ htop \ @@ -41,6 +42,7 @@ apt-get -y install \ libblkid-dev \ libbsd-dev \ libcap-dev \ + libcephfs-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -95,6 +97,7 @@ apt-get -y install \ tar \ tree \ uuid-dev \ + xfslibs-dev \ xsltproc \ zlib1g-dev diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml index 80ddb1d2dbd..03862993de3 100644 --- a/bootstrap/generated-dists/debian7/packages.yml +++ b/bootstrap/generated-dists/debian7/packages.yml @@ -17,6 +17,7 @@ packages: - gcc - gdb - git + - glusterfs-common - gzip - hostname - htop @@ -30,6 +31,7 @@ packages: - libblkid-dev - libbsd-dev - libcap-dev + - libcephfs-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -84,5 +86,6 @@ packages: - tar - tree - uuid-dev + - xfslibs-dev - xsltproc - zlib1g-dev \ No newline at end of file diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh index 5194507f447..73db186c1d9 100755 --- a/bootstrap/generated-dists/debian8/bootstrap.sh +++ b/bootstrap/generated-dists/debian8/bootstrap.sh @@ -28,6 +28,7 @@ apt-get -y install \ gcc \ gdb \ git \ + glusterfs-common \ gzip \ hostname \ htop \ @@ -41,6 +42,7 @@ apt-get -y install \ libblkid-dev \ libbsd-dev \ libcap-dev \ + libcephfs-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -99,6 +101,7 @@ apt-get -y install \ tar \ tree \ uuid-dev \ + xfslibs-dev \ xsltproc \ zlib1g-dev diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml index 5655fb57d7c..7aaeb2a2f09 100644 --- a/bootstrap/generated-dists/debian8/packages.yml +++ b/bootstrap/generated-dists/debian8/packages.yml @@ -17,6 +17,7 @@ packages: - gcc - gdb - git + - glusterfs-common - gzip - hostname - htop @@ -30,6 +31,7 @@ packages: - libblkid-dev - libbsd-dev - libcap-dev + - libcephfs-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -88,5 +90,6 @@ packages: - tar - tree - uuid-dev + - xfslibs-dev - xsltproc - zlib1g-dev \ No newline at end of file diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh index a765307ab7c..7fa82c9f042 100755 --- a/bootstrap/generated-dists/debian9/bootstrap.sh +++ b/bootstrap/generated-dists/debian9/bootstrap.sh @@ -28,6 +28,7 @@ apt-get -y install \ gcc \ gdb \ git \ + glusterfs-common \ gzip \ hostname \ htop \ @@ -41,6 +42,7 @@ apt-get -y install \ libblkid-dev \ libbsd-dev \ libcap-dev \ + libcephfs-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -99,6 +101,7 @@ apt-get -y install \ tar \ tree \ uuid-dev \ + xfslibs-dev \ xsltproc \ zlib1g-dev diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml index b4e2013eb47..85736819f58 100644 --- a/bootstrap/generated-dists/debian9/packages.yml +++ b/bootstrap/generated-dists/debian9/packages.yml @@ -17,6 +17,7 @@ packages: - gcc - gdb - git + - glusterfs-common - gzip - hostname - htop @@ -30,6 +31,7 @@ packages: - libblkid-dev - libbsd-dev - libcap-dev + - libcephfs-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -88,5 +90,6 @@ packages: - tar - tree - uuid-dev + - xfslibs-dev - xsltproc - zlib1g-dev \ No newline at end of file diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh index 6793a37b8c9..aa9d64c492a 100755 --- a/bootstrap/generated-dists/fedora28/bootstrap.sh +++ b/bootstrap/generated-dists/fedora28/bootstrap.sh @@ -7,9 +7,9 @@ set -xueo pipefail -dnf -y -q update +dnf update -y -dnf -y -q --verbose install \ +dnf install -y \ @development-tools \ acl \ attr \ @@ -31,6 +31,8 @@ dnf -y -q --verbose install \ glib2-devel \ glibc-common \ glibc-langpack-en \ + glusterfs-api-devel \ + glusterfs-devel \ gnutls-devel \ gpgme-devel \ gzip \ @@ -47,6 +49,7 @@ dnf -y -q --verbose install \ libblkid-devel \ libbsd-devel \ libcap-devel \ + libcephfs-devel \ libicu-devel \ libnsl2-devel \ libpcap-devel \ @@ -92,6 +95,7 @@ dnf -y -q --verbose install \ redhat-lsb \ rng-tools \ rpcgen \ + rpcsvc-proto-devel \ rsync \ sed \ sudo \ @@ -99,6 +103,7 @@ dnf -y -q --verbose install \ tar \ tree \ which \ + xfsprogs-devel \ yum-utils \ zlib-devel diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml index a37f78b33d2..8c81c565351 100644 --- a/bootstrap/generated-dists/fedora28/packages.yml +++ b/bootstrap/generated-dists/fedora28/packages.yml @@ -21,6 +21,8 @@ packages: - glib2-devel - glibc-common - glibc-langpack-en + - glusterfs-api-devel + - glusterfs-devel - gnutls-devel - gpgme-devel - gzip @@ -37,6 +39,7 @@ packages: - libblkid-devel - libbsd-devel - libcap-devel + - libcephfs-devel - libicu-devel - libnsl2-devel - libpcap-devel @@ -82,6 +85,7 @@ packages: - redhat-lsb - rng-tools - rpcgen + - rpcsvc-proto-devel - rsync - sed - sudo @@ -89,5 +93,6 @@ packages: - tar - tree - which + - xfsprogs-devel - yum-utils - zlib-devel \ No newline at end of file diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh index 6793a37b8c9..aa9d64c492a 100755 --- a/bootstrap/generated-dists/fedora29/bootstrap.sh +++ b/bootstrap/generated-dists/fedora29/bootstrap.sh @@ -7,9 +7,9 @@ set -xueo pipefail -dnf -y -q update +dnf update -y -dnf -y -q --verbose install \ +dnf install -y \ @development-tools \ acl \ attr \ @@ -31,6 +31,8 @@ dnf -y -q --verbose install \ glib2-devel \ glibc-common \ glibc-langpack-en \ + glusterfs-api-devel \ + glusterfs-devel \ gnutls-devel \ gpgme-devel \ gzip \ @@ -47,6 +49,7 @@ dnf -y -q --verbose install \ libblkid-devel \ libbsd-devel \ libcap-devel \ + libcephfs-devel \ libicu-devel \ libnsl2-devel \ libpcap-devel \ @@ -92,6 +95,7 @@ dnf -y -q --verbose install \ redhat-lsb \ rng-tools \ rpcgen \ + rpcsvc-proto-devel \ rsync \ sed \ sudo \ @@ -99,6 +103,7 @@ dnf -y -q --verbose install \ tar \ tree \ which \ + xfsprogs-devel \ yum-utils \ zlib-devel diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml index a37f78b33d2..8c81c565351 100644 --- a/bootstrap/generated-dists/fedora29/packages.yml +++ b/bootstrap/generated-dists/fedora29/packages.yml @@ -21,6 +21,8 @@ packages: - glib2-devel - glibc-common - glibc-langpack-en + - glusterfs-api-devel + - glusterfs-devel - gnutls-devel - gpgme-devel - gzip @@ -37,6 +39,7 @@ packages: - libblkid-devel - libbsd-devel - libcap-devel + - libcephfs-devel - libicu-devel - libnsl2-devel - libpcap-devel @@ -82,6 +85,7 @@ packages: - redhat-lsb - rng-tools - rpcgen + - rpcsvc-proto-devel - rsync - sed - sudo @@ -89,5 +93,6 @@ packages: - tar - tree - which + - xfsprogs-devel - yum-utils - zlib-devel \ No newline at end of file diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh index dbf7dabf55a..0d79288ef3f 100755 --- a/bootstrap/generated-dists/opensuse150/bootstrap.sh +++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh @@ -29,6 +29,7 @@ zypper --non-interactive install \ git \ glib2-devel \ glibc-locale \ + glusterfs-devel \ gnutls-devel \ gpgme-devel \ gzip \ @@ -44,6 +45,7 @@ zypper --non-interactive install \ libblkid-devel \ libbsd-devel \ libcap-devel \ + libcephfs-devel \ libicu-devel \ libjansson-devel \ libnettle-devel \ @@ -87,6 +89,7 @@ zypper --non-interactive install \ readline-devel \ rng-tools \ rpcgen \ + rpcsvc-proto-devel \ rsync \ sed \ sudo \ @@ -94,6 +97,7 @@ zypper --non-interactive install \ tar \ tree \ which \ + xfsprogs-devel \ yum-utils \ zlib-devel \ system-user-nobody diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml index a6c989ffebd..ddf8cdb7ba6 100644 --- a/bootstrap/generated-dists/opensuse150/packages.yml +++ b/bootstrap/generated-dists/opensuse150/packages.yml @@ -19,6 +19,7 @@ packages: - git - glib2-devel - glibc-locale + - glusterfs-devel - gnutls-devel - gpgme-devel - gzip @@ -34,6 +35,7 @@ packages: - libblkid-devel - libbsd-devel - libcap-devel + - libcephfs-devel - libicu-devel - libjansson-devel - libnettle-devel @@ -77,6 +79,7 @@ packages: - readline-devel - rng-tools - rpcgen + - rpcsvc-proto-devel - rsync - sed - sudo @@ -84,5 +87,6 @@ packages: - tar - tree - which + - xfsprogs-devel - yum-utils - zlib-devel \ No newline at end of file diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh index 2c2b85402f0..478d7c9a0d6 100755 --- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh @@ -99,6 +99,7 @@ apt-get -y install \ tar \ tree \ uuid-dev \ + xfslibs-dev \ xsltproc \ zlib1g-dev diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml index c526596bd47..b796d0d2d37 100644 --- a/bootstrap/generated-dists/ubuntu1404/packages.yml +++ b/bootstrap/generated-dists/ubuntu1404/packages.yml @@ -88,5 +88,6 @@ packages: - tar - tree - uuid-dev + - xfslibs-dev - xsltproc - zlib1g-dev \ No newline at end of file diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh index 441c78ca13b..43c66be224b 100755 --- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh @@ -100,6 +100,7 @@ apt-get -y install \ tar \ tree \ uuid-dev \ + xfslibs-dev \ xsltproc \ zlib1g-dev diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml index eedc0a01e2b..b9c4cb0308c 100644 --- a/bootstrap/generated-dists/ubuntu1604/packages.yml +++ b/bootstrap/generated-dists/ubuntu1604/packages.yml @@ -89,5 +89,6 @@ packages: - tar - tree - uuid-dev + - xfslibs-dev - xsltproc - zlib1g-dev \ No newline at end of file diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh index 8bed53400a4..0defc9325b6 100755 --- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh @@ -28,6 +28,7 @@ apt-get -y install \ gcc \ gdb \ git \ + glusterfs-common \ gzip \ hostname \ htop \ @@ -42,6 +43,7 @@ apt-get -y install \ libblkid-dev \ libbsd-dev \ libcap-dev \ + libcephfs-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -100,6 +102,7 @@ apt-get -y install \ tar \ tree \ uuid-dev \ + xfslibs-dev \ xsltproc \ zlib1g-dev diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml index 0f4332688bf..6b3c00910c8 100644 --- a/bootstrap/generated-dists/ubuntu1804/packages.yml +++ b/bootstrap/generated-dists/ubuntu1804/packages.yml @@ -17,6 +17,7 @@ packages: - gcc - gdb - git + - glusterfs-common - gzip - hostname - htop @@ -31,6 +32,7 @@ packages: - libblkid-dev - libbsd-dev - libcap-dev + - libcephfs-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -89,5 +91,6 @@ packages: - tar - tree - uuid-dev + - xfslibs-dev - xsltproc - zlib1g-dev \ No newline at end of file diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index d7dbdaee084..648f1cc9748 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -5c2b831fb6aef8abd25dbdc6ade53ba2ebad1a1c +735b9b509e6928bc71fe4442798e4fe110a98788 -- 2.34.1