Merge pull request #612 from gerrod3/3.39-set-pulpcore

Set pulpcore version to 3.39
pulp · Mar 11, 2024 · 0261b4c · 0261b4c
2 parents 5f75f0a + 8aa79b7
commit 0261b4c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/images/pulp-minimal/stable/Containerfile.core b/images/pulp-minimal/stable/Containerfile.core
@@ -1,7 +1,7 @@
 ARG FROM_TAG="latest"
 FROM pulp/base:${FROM_TAG}
 
-ARG PULPCORE_VERSION=""
+ARG PULPCORE_VERSION="~=3.39.0"
 ARG PULP_ANSIBLE_VERSION=""
 ARG PULP_CERTGUARD_VERSION=""
 ARG PULP_CONTAINER_VERSION=""

diff --git a/images/pulp/stable/Containerfile b/images/pulp/stable/Containerfile
@@ -1,7 +1,7 @@
 ARG FROM_TAG="latest"
 FROM pulp/pulp-ci-centos:${FROM_TAG}
 
-ARG PULPCORE_VERSION=""
+ARG PULPCORE_VERSION="~=3.39.0"
 ARG PULP_ANSIBLE_VERSION=""
 ARG PULP_CERTGUARD_VERSION=""
 ARG PULP_CONTAINER_VERSION=""

diff --git a/images/s6_assets/test.sh b/images/s6_assets/test.sh
@@ -67,6 +67,8 @@ mkdir -p settings pulp_storage pgsql containers
 echo "CONTENT_ORIGIN='$scheme://localhost:8080'" >> settings/settings.py
 echo "ALLOWED_EXPORT_PATHS = ['/tmp']" >> settings/settings.py
 echo "ORPHAN_PROTECTION_TIME = 0" >> settings/settings.py
+# pulp_rpm < 3.25 requires sha1 in allowed checksums
+echo "ALLOWED_CONTENT_CHECKSUMS = ['sha1', 'sha256', 'sha512']" >> settings/settings.py
 
 if [ "$old_image" != "" ]; then
   start_container_and_wait $old_image