Backport Update pulp-glue requirement from <0.29,>=0.18.0 to >=0.18.0…

…,<0.30
pulp · Oct 17, 2024 · fa1b0e0 · fa1b0e0
1 parent fffdb90
commit fa1b0e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
@@ -76,7 +76,7 @@ services:
 VARSYAML
 
 cat >> vars/main.yaml << VARSYAML
-pulp_env: {}
+pulp_env: {"PULP_CA_BUNDLE": "/etc/pulp/certs/pulp_webserver.crt"}
 pulp_settings: {"allowed_export_paths": ["/tmp"], "allowed_import_paths": ["/tmp"], "orphan_protection_time": 0}
 pulp_scheme: https
 pulp_default_container: ghcr.io/pulp/pulp-ci-centos9:latest

diff --git a/requirements.txt b/requirements.txt
@@ -28,7 +28,7 @@ opentelemetry-exporter-otlp-proto-http>=1.17.0,<=1.23.0
 opentelemetry-instrumentation-django>=0.38b0,<=0.44b0
 opentelemetry-instrumentation-wsgi>=0.38b0,<=0.44b0
 protobuf>=4.21.1,<4.25.4
-pulp-glue>=0.18.0,<0.29
+pulp-glue>=0.18.0,<0.30
 pygtrie>=2.5,<=2.5.0
 psycopg[binary]>=3.1.8,<=3.2.3
 pyparsing>=3.1.0,<=3.1.1

diff --git a/template_config.yml b/template_config.yml
@@ -41,7 +41,8 @@ plugins:
   name: pulp-certguard
 post_job_template: null
 pre_job_template: null
-pulp_env: {}
+pulp_env:
+  PULP_CA_BUNDLE: /etc/pulp/certs/pulp_webserver.crt
 pulp_env_azure:
   otel_bsp_max_export_batch_size: 1
   otel_bsp_max_queue_size: 1