[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Mon Jun 22 15:54:02 UTC 2020
The branch, master has been updated
via ba5a73b1544 tests: Only run mdsparser test if we build with spotlight support
via d6275ebb1da gitlab-ci: Use Fedora 32 to test FIPS mode
via 225db6148c7 bootstrap: Add back quota-devel on CentOS8
from e1335efa161 libcli: Remove define STATUS_EA_LIST_INCONSISTENT
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ba5a73b1544d282636b500e9ab84a8ab16a7eda8
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jun 22 16:06:36 2020 +0200
tests: Only run mdsparser test if we build with spotlight support
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Mon Jun 22 15:53:30 UTC 2020 on sn-devel-184
commit d6275ebb1da8c25259171915eae8c6e88978436c
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jun 22 13:52:05 2020 +0200
gitlab-ci: Use Fedora 32 to test FIPS mode
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
commit 225db6148c70c2117866a5d7e6ffd08cbff67609
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jun 17 14:16:13 2020 +0200
bootstrap: Add back quota-devel on CentOS8
https://bugs.centos.org/view.php?id=16549
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 4 ++--
bootstrap/config.py | 4 +++-
bootstrap/generated-dists/centos8/bootstrap.sh | 4 ++++
bootstrap/generated-dists/centos8/packages.yml | 1 +
bootstrap/sha1sum.txt | 2 +-
selftest/tests.py | 6 ++++--
6 files changed, 15 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68e1a52bf1e..c657b4a1d8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: c6ee634a9467e84ee8dd858b0b363f7a75973a66
+ SAMBA_CI_CONTAINER_TAG: 1275dc52ac8c1de5981f267df88b85b6f87e299a
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -184,7 +184,7 @@ samba-ad-dc-4-mitkrb5:
samba-fips:
extends: .shared_template
- image: $SAMBA_CI_CONTAINER_IMAGE_fedora31
+ image: $SAMBA_CI_CONTAINER_IMAGE_fedora32
.private_template:
extends: .shared_template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 62a59b5cc57..24f21a3c749 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -230,7 +230,10 @@ set -xueo pipefail
yum update -y
yum install -y dnf-plugins-core
yum install -y epel-release
+
+yum -v repolist all
yum config-manager --set-enabled PowerTools -y
+yum config-manager --set-enabled Devel -y
yum update -y
yum install -y \
@@ -460,7 +463,6 @@ RPM_DISTS = {
'perl-JSON-Parse': '', # does not exist?
'perl-Test-Base': 'perl-Test-Simple',
'policycoreutils-python': 'python3-policycoreutils',
- 'quota-devel': '', # FIXME: Add me back, once available!
'liburing-devel': '', # not available yet, Add me back, once available!
}
},
diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index a211daf2162..b494d0040dd 100755
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -10,7 +10,10 @@ set -xueo pipefail
yum update -y
yum install -y dnf-plugins-core
yum install -y epel-release
+
+yum -v repolist all
yum config-manager --set-enabled PowerTools -y
+yum config-manager --set-enabled Devel -y
yum update -y
yum install -y \
@@ -93,6 +96,7 @@ yum install -y \
python3-markdown \
python3-policycoreutils \
python3-pyasn1 \
+ quota-devel \
readline-devel \
redhat-lsb \
rng-tools \
diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index 4d87303bcc2..f3ba7a9088a 100644
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -78,6 +78,7 @@ packages:
- python3-markdown
- python3-policycoreutils
- python3-pyasn1
+ - quota-devel
- readline-devel
- redhat-lsb
- rng-tools
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 97c1408594b..345d4a95e98 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-c6ee634a9467e84ee8dd858b0b363f7a75973a66
+1275dc52ac8c1de5981f267df88b85b6f87e299a
diff --git a/selftest/tests.py b/selftest/tests.py
index 73932cd28be..dd3cc5ec8fb 100644
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -44,6 +44,7 @@ finally:
have_man_pages_support = ("XSLTPROC_MANPAGES" in config_hash)
with_pam = ("WITH_PAM" in config_hash)
+with_elasticsearch_backend = ("HAVE_SPOTLIGHT_BACKEND_ES" in config_hash)
pam_wrapper_so_path = config_hash["LIBPAM_WRAPPER_SO_PATH"]
pam_set_items_so_path = config_hash["PAM_SET_ITEMS_SO_PATH"]
@@ -407,5 +408,6 @@ plantestsuite("samba.unittests.test_registry_regfio", "none",
[os.path.join(bindir(), "default/source3/test_registry_regfio")])
plantestsuite("samba.unittests.test_oLschema2ldif", "none",
[os.path.join(bindir(), "default/source4/utils/oLschema2ldif/test_oLschema2ldif")])
-plantestsuite("samba.unittests.mdsparser_es", "none",
- [os.path.join(bindir(), "default/source3/test_mdsparser_es")] + [configuration])
+if with_elasticsearch_backend:
+ plantestsuite("samba.unittests.mdsparser_es", "none",
+ [os.path.join(bindir(), "default/source3/test_mdsparser_es")] + [configuration])
--
Samba Shared Repository
More information about the samba-cvs
mailing list