bootstrap: Install python3-dateutil instead of python3-iso8601 on RPM distros

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 Jul 21 12:18:30 UTC 2021 on sn-devel-184

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 84cb9f0ba4e824a34a186444a6f8cc80be101137..9ea3a3f560673e9db005d06986cb2a7f03b73649 100644 (file)
--- 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: 11d550c08430787a5b0eb8dc847977ffffe12bbe
+  SAMBA_CI_CONTAINER_TAG: b5333a93306e20ba549f5fac3c6c74e0b103c1d6
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.

diff --git a/bootstrap/config.py b/bootstrap/config.py
index b02ce4cf5666db148ff2a7dd75e2bc92c14a9c52..821ce3d5cc2781e83ebc4221253e3045d9c8fbf1 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -485,6 +485,7 @@ RPM_DISTS = {
             'lsb-release': 'redhat-lsb',
             'libsemanage-python': 'python3-libsemanage',
             'policycoreutils-python': 'python3-policycoreutils',
+            'python3-iso8601': 'python3-dateutil',
         }
     },
     'fedora34': {
@@ -496,6 +497,7 @@ RPM_DISTS = {
             '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
         }
     },
@@ -552,6 +554,7 @@ RPM_DISTS = {
             'perl-interpreter': '',
             'perl-FindBin': '',
             'procps-ng': 'procps',
+            'python3-iso8601': 'python3-python-dateutil',
             'python3-dns': 'python3-dnspython',
             'python3-markdown': 'python3-Markdown',
             'quota-devel': '',

diff --git a/bootstrap/generated-dists/fedora33/bootstrap.sh b/bootstrap/generated-dists/fedora33/bootstrap.sh
index 22b968e9ae2e1bf2506adb341570f88f5fe233d1..52e199f6b889d17efedac74d017544bc6485a0f3 100755 (executable)
--- a/bootstrap/generated-dists/fedora33/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora33/bootstrap.sh
@@ -87,10 +87,10 @@ dnf install -y \
     psmisc \
     python3 \
     python3-cryptography \
+    python3-dateutil \
     python3-devel \
     python3-dns \
     python3-gpg \
-    python3-iso8601 \
     python3-libsemanage \
     python3-markdown \
     python3-policycoreutils \

diff --git a/bootstrap/generated-dists/fedora33/packages.yml b/bootstrap/generated-dists/fedora33/packages.yml
index 7c61da3c53a02cf342949a37b29ff7a593accc94..d9cbfbd80dbc1dea6c3d97d13194e48c9f5b2785 100644 (file)
--- a/bootstrap/generated-dists/fedora33/packages.yml
+++ b/bootstrap/generated-dists/fedora33/packages.yml
@@ -76,10 +76,10 @@ packages:
   - psmisc
   - python3
   - python3-cryptography
+  - python3-dateutil
   - python3-devel
   - python3-dns
   - python3-gpg
-  - python3-iso8601
   - python3-libsemanage
   - python3-markdown
   - python3-policycoreutils

diff --git a/bootstrap/generated-dists/fedora34/bootstrap.sh b/bootstrap/generated-dists/fedora34/bootstrap.sh
index d5fea5c008a0510c76b5af75b306936719bc01b0..de5a96706016abd5c2bbfcdb367694e19bd00489 100755 (executable)
--- a/bootstrap/generated-dists/fedora34/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora34/bootstrap.sh
@@ -86,10 +86,10 @@ dnf install -y \
     psmisc \
     python3 \
     python3-cryptography \
+    python3-dateutil \
     python3-devel \
     python3-dns \
     python3-gpg \
-    python3-iso8601 \
     python3-libsemanage \
     python3-markdown \
     python3-policycoreutils \

diff --git a/bootstrap/generated-dists/fedora34/packages.yml b/bootstrap/generated-dists/fedora34/packages.yml
index db12fdb548651945d2361b38eb35d6a16e4283f1..749f30dfc0eaf2b3784748597f220c93d9681db0 100644 (file)
--- a/bootstrap/generated-dists/fedora34/packages.yml
+++ b/bootstrap/generated-dists/fedora34/packages.yml
@@ -75,10 +75,10 @@ packages:
   - psmisc
   - python3
   - python3-cryptography
+  - python3-dateutil
   - python3-devel
   - python3-dns
   - python3-gpg
-  - python3-iso8601
   - python3-libsemanage
   - python3-markdown
   - python3-policycoreutils

diff --git a/bootstrap/generated-dists/opensuse152/bootstrap.sh b/bootstrap/generated-dists/opensuse152/bootstrap.sh
index bdfb121b34599aebd1592dcfaa835b382f506273..534ff66896fc81b159f8d6ae744164b8b5217f35 100755 (executable)
--- a/bootstrap/generated-dists/opensuse152/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse152/bootstrap.sh
@@ -88,8 +88,8 @@ zypper --non-interactive install \
     python3-devel \
     python3-dnspython \
     python3-gpg \
-    python3-iso8601 \
     python3-pyasn1 \
+    python3-python-dateutil \
     python3-setproctitle \
     readline-devel \
     rng-tools \

diff --git a/bootstrap/generated-dists/opensuse152/packages.yml b/bootstrap/generated-dists/opensuse152/packages.yml
index 75a37074791b88b9532d496a71fcb42b2077ad9f..05b3779a2fdd1c930e51d6cdeb861e2dd8898fcf 100644 (file)
--- a/bootstrap/generated-dists/opensuse152/packages.yml
+++ b/bootstrap/generated-dists/opensuse152/packages.yml
@@ -76,8 +76,8 @@ packages:
   - python3-devel
   - python3-dnspython
   - python3-gpg
-  - python3-iso8601
   - python3-pyasn1
+  - python3-python-dateutil
   - python3-setproctitle
   - readline-devel
   - rng-tools

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 0e70f1937b9719ac2d6ab8e988a6b3b6eab8a06b..e7de92cc5042e46dfc6c3d3fd54b1d13756c4264 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-11d550c08430787a5b0eb8dc847977ffffe12bbe
+b5333a93306e20ba549f5fac3c6c74e0b103c1d6