Merge branch 'stackhpc/2024.1' into 2024.1-ansible-lint-alex

stackhpc · Jan 8, 2025 · adcbe22 · adcbe22
2 parents e84937e + 1e221f3
commit adcbe22
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/.github/workflows/ipa-image-build.yml b/.github/workflows/ipa-image-build.yml
@@ -76,7 +76,7 @@ jobs:
           pip install -r ../src/kayobe-config/requirements.txt
 
       - name: Install terraform
-        uses: hashicorp/setup-terraform@v3
+        uses: hashicorp/setup-terraform@v2
 
       - name: Initialise terraform
         run: terraform init
@@ -206,7 +206,8 @@ jobs:
           kayobe overcloud deployment image build --force-rebuild \
           -e os_distribution="ubuntu" \
           -e os_release="jammy" \
-          -e ipa_ci_builder_distribution="ubuntu"
+          -e ipa_ci_builder_distribution="ubuntu" \
+          -e ipa_ci_builder_release="jammy"
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: inputs.ubuntu-jammy
@@ -264,7 +265,8 @@ jobs:
           kayobe overcloud deployment image build --force-rebuild \
           -e os_distribution="rocky" \
           -e os_release="9" \
-          -e ipa_ci_builder_distribution="rocky"
+          -e ipa_ci_builder_distribution="rocky" \
+          -e ipa_ci_builder_release="9"
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: inputs.rocky9

diff --git a/etc/kayobe/ansible/pulp-artifact-upload.yml b/etc/kayobe/ansible/pulp-artifact-upload.yml
@@ -142,23 +142,6 @@
       retries: 3
       delay: 5
 
-    - name: Update distribution for latest version
-      pulp.squeezer.file_distribution:
-        pulp_url: "{{ remote_pulp_url }}"
-        username: "{{ remote_pulp_username }}"
-        password: "{{ remote_pulp_password }}"
-        name: "{{ repository_name }}_latest"
-        base_path: "{{ pulp_base_path }}/latest"
-        publication: "{{ publication_details.publication.pulp_href }}"
-        content_guard: development
-        state: present
-      register: latest_distribution_details
-      until: latest_distribution_details is success
-      retries: 3
-      delay: 5
-      notify: Latest distribution details changed
-
-  handlers:
     - name: Create distribution for given version
       pulp.squeezer.file_distribution:
         pulp_url: "{{ remote_pulp_url }}"
@@ -169,7 +152,6 @@
         publication: "{{ publication_details.publication.pulp_href }}"
         content_guard: development
         state: present
-      listen: Latest distribution details changed
       register: distribution_result
       until: distribution_result is success
       retries: 3
@@ -180,25 +162,11 @@
         path: /tmp/updated_artifacts.txt
         line: "{{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/{{ artifact_tag }}/{{ found_files.files[0].path | basename }}"
         create: true
-      listen: Latest distribution details changed
-
-    - name: Update new artifacts file with latest path
-      ansible.builtin.lineinfile:
-        path: /tmp/updated_artifacts.txt
-        line: "{{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/latest/{{ found_files.files[0].path | basename }}"
-      listen: Latest distribution details changed
 
     - name: Print versioned path
       ansible.builtin.debug:
         msg: "New versioned path: {{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/{{ artifact_tag }}/{{ found_files.files[0].path | basename }}"
-      listen: Latest distribution details changed
-
-    - name: Print latest path
-      ansible.builtin.debug:
-        msg: "New latest path: {{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/latest/{{ found_files.files[0].path | basename }}"
-      listen: Latest distribution details changed
 
     - name: Print version tag
       ansible.builtin.debug:
         msg: "New tag: {{ artifact_tag }}"
-      listen: Latest distribution details changed
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -101,6 +101,7 @@ stackhpc_release_pulp_password: "{{ stackhpc_docker_registry_password }}"
 ipa_build_images: true
 ipa_build_dib_env_extra:
   DISTRO_NAME: "{{ ipa_ci_builder_distribution | default('ubuntu') }}"
+  DIB_RELEASE: "{{ ipa_ci_builder_release | default('jammy') }}"
 
 # Ensure Ark repos are disabled during CI runs, this is due to
 # builder being a member of the 'overcloud' group for IPA builds.

diff --git a/etc/kayobe/pulp-ipa-image-versions.yml b/etc/kayobe/pulp-ipa-image-versions.yml
@@ -1,4 +1,4 @@
 ---
 # IPA image versioning tags
-stackhpc_rocky_9_ipa_image_version: "2024.1-20241206T160829"
+stackhpc_rocky_9_ipa_image_version: "2024.1-20241231T102920"
 stackhpc_ubuntu_jammy_ipa_image_version: "2024.1-20241206T160829"