diff --git a/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc b/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc index 7d5f4b59e..00cbf95ee 100644 --- a/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc +++ b/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc @@ -531,13 +531,15 @@ ifeval::["{build}" != "downstream"] edpm_bootstrap_command: | # This is a hack to deploy RDO Delorean repos to RHEL as if it were Centos 9 Stream set -euxo pipefail - curl -sL https://github.com/openstack-k8s-operators/repo-setup/archive/refs/heads/main.tar.gz | tar -xz + REPO_SETUP_URL="https://github.com/openstack-k8s-operators/repo-setup/archive/4552fa02b6bc28c542d6aa8bc0ec9d15291b5ff3.tar.gz" + mkdir -p repo-setup-dir + curl -sL "$REPO_SETUP_URL" | tar -xz -C repo-setup-dir --strip-components=1 python3 -m venv ./venv - PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-main + PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-dir sudo ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream sudo dnf -y upgrade openstack-selinux sudo rm -f /run/virtlogd.pid - sudo rm -rf repo-setup-main + sudo rm -rf repo-setup-dir endif::[] ifeval::["{build}" == "downstream"] edpm_bootstrap_command: | diff --git a/docs_user/modules/proc_adopting-networker-services-to-the-data-plane.adoc b/docs_user/modules/proc_adopting-networker-services-to-the-data-plane.adoc index bf6f54e49..b58f7d4d3 100644 --- a/docs_user/modules/proc_adopting-networker-services-to-the-data-plane.adoc +++ b/docs_user/modules/proc_adopting-networker-services-to-the-data-plane.adoc @@ -236,11 +236,13 @@ ifeval::["{build}" != "downstream"] edpm_bootstrap_command: | # This is a hack to deploy RDO Delorean repos to RHEL as if it were Centos 9 Stream set -euxo pipefail - curl -sL https://github.com/openstack-k8s-operators/repo-setup/archive/refs/heads/main.tar.gz | tar -xz + REPO_SETUP_URL="https://github.com/openstack-k8s-operators/repo-setup/archive/4552fa02b6bc28c542d6aa8bc0ec9d15291b5ff3.tar.gz" + mkdir -p repo-setup-dir + curl -sL "$REPO_SETUP_URL" | tar -xz -C repo-setup-dir --strip-components=1 python3 -m venv ./venv - PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-main + PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-dir sudo ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream - sudo rm -rf repo-setup-main + sudo rm -rf repo-setup-dir endif::[] gather_facts: false diff --git a/docs_user/modules/proc_converting-object-storage-nodes.adoc b/docs_user/modules/proc_converting-object-storage-nodes.adoc index ec1642e8d..744338704 100644 --- a/docs_user/modules/proc_converting-object-storage-nodes.adoc +++ b/docs_user/modules/proc_converting-object-storage-nodes.adoc @@ -194,13 +194,15 @@ ifeval::["{build}" != "downstream"] edpm_bootstrap_command: | # This is a hack to deploy RDO Delorean repos to RHEL as if it were Centos 9 Stream set -euxo pipefail - curl -sL https://github.com/openstack-k8s-operators/repo-setup/archive/refs/heads/main.tar.gz | tar -xz + REPO_SETUP_URL="https://github.com/openstack-k8s-operators/repo-setup/archive/4552fa02b6bc28c542d6aa8bc0ec9d15291b5ff3.tar.gz" + mkdir -p repo-setup-dir + curl -sL "$REPO_SETUP_URL" | tar -xz -C repo-setup-dir --strip-components=1 python3 -m venv ./venv - PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-main + PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-dir sudo ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream sudo dnf -y upgrade openstack-selinux sudo rm -f /run/virtlogd.pid - sudo rm -rf repo-setup-main + sudo rm -rf repo-setup-dir endif::[] ifeval::["{build}" == "downstream"] rhc_release: 9.2 diff --git a/tests/roles/common_defaults/defaults/main.yaml b/tests/roles/common_defaults/defaults/main.yaml index f1b9abca7..a9acfe85d 100644 --- a/tests/roles/common_defaults/defaults/main.yaml +++ b/tests/roles/common_defaults/defaults/main.yaml @@ -2,6 +2,9 @@ # sensitive data. use_no_log: true +# URL for the repo-setup tarball, pinned to a specific SHA +repo_setup_url: "https://github.com/openstack-k8s-operators/repo-setup/archive/4552fa02b6bc28c542d6aa8bc0ec9d15291b5ff3.tar.gz" + # Network configuration for IPv4/IPv6 support ipv6_enabled: false internalapi_prefix: "172.17.0" diff --git a/tests/roles/dataplane_adoption/defaults/main.yaml b/tests/roles/dataplane_adoption/defaults/main.yaml index 0da60d090..52ea7408f 100644 --- a/tests/roles/dataplane_adoption/defaults/main.yaml +++ b/tests/roles/dataplane_adoption/defaults/main.yaml @@ -105,9 +105,10 @@ edpm_nodes: edpm_bootstrap_command: | # This is a hack to deploy RDO Delorean repos to RHEL as if it were Centos 9 Stream set -euxo pipefail - curl -sL https://github.com/openstack-k8s-operators/repo-setup/archive/refs/heads/main.tar.gz | tar -xz + mkdir -p repo-setup-dir + curl -sL "{{ repo_setup_url }}" | tar -xz -C repo-setup-dir --strip-components=1 python3 -m venv ./venv - PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-main + PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-dir ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream {%+ if compute_adoption|bool +%} # Exclude ceph-common-18.2.7|8|9 as it's pulling newer openssl not compatible diff --git a/tests/roles/swift_conversion/defaults/main.yaml b/tests/roles/swift_conversion/defaults/main.yaml index 86e63931c..db1c5014d 100644 --- a/tests/roles/swift_conversion/defaults/main.yaml +++ b/tests/roles/swift_conversion/defaults/main.yaml @@ -13,11 +13,12 @@ edpm_user: root edpm_bootstrap_command: | # This is a hack to deploy RDO Delorean repos to RHEL as if it were Centos 9 Stream set -euxo pipefail - curl -sL https://github.com/openstack-k8s-operators/repo-setup/archive/refs/heads/main.tar.gz | tar -xz + mkdir -p repo-setup-dir + curl -sL "{{ repo_setup_url }}" | tar -xz -C repo-setup-dir --strip-components=1 python3 -m venv ./venv - PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-main + PBR_VERSION=0.0.0 ./venv/bin/pip install ./repo-setup-dir ./venv/bin/repo-setup current-podified -b antelope -d centos9 --stream - rm -rf repo-setup-main + rm -rf repo-setup-dir swift_conversion_nodeset: | apiVersion: dataplane.openstack.org/v1beta1