[patch] fix db2u mirror using addig --filter db2

ibm-mas · Jan 28, 2025 · 6098908 · 6098908
1 parent 4dbb848
commit 6098908
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/ibm/mas_devops/playbooks/mirror_dependencies.yml b/ibm/mas_devops/playbooks/mirror_dependencies.yml
@@ -535,6 +535,7 @@
         case_name: ibm-db2uoperator
         case_version: "{{ mas_catalog_metadata.db2u_version }}"
         exclude_images: []
+        image_group_filter: "{{ lookup('env', 'IMAGE_GROUP_FILTER') }}"
 
     - role: ibm.mas_devops.mirror_images
       when: mirror_db2u

diff --git a/ibm/mas_devops/roles/mirror_case_prepare/defaults/main.yml b/ibm/mas_devops/roles/mirror_case_prepare/defaults/main.yml
@@ -30,3 +30,7 @@ mirror_working_dir: "{{ lookup('env', 'MIRROR_WORKING_DIR') }}"
 ibmpak_skip_dependencies: "{{ lookup('env', 'IBMPAK_SKIP_DEPENDENCIES') | default('False', True) | bool  }}"
 ibmpak_skip_verify: "{{ lookup('env', 'IBMPAK_SKIP_VERIFY') | default('False', True) | bool  }}"
 ibmpak_insecure: "{{ lookup('env', 'IBMPAK_INSECURE') | default('False', True) | bool }}"
+
+# Below set the filter, if Passed non-empty, non-false value
+# --filter {{ image_group_filter }}
+image_group_filter: "{{ lookup('env', 'IMAGE_GROUP_FILTER') }}"
diff --git a/ibm/mas_devops/roles/mirror_case_prepare/tasks/main.yml b/ibm/mas_devops/roles/mirror_case_prepare/tasks/main.yml
@@ -98,7 +98,7 @@
 # 7. Generate mirror-manifest direct
 # -----------------------------------------------------------------------------
 - name: "{{ case_name }} : Generate the mirror manifest from the CASE bundle (direct)"
-  shell: "oc ibm-pak generate mirror-manifests {{ case_name }} {{ registry_public_url_with_path }} --version {{ build_version }} {% if image_group_filter is defined %} --filter {{ image_group_filter }} {% endif %}"
+  shell: "oc ibm-pak generate mirror-manifests {{ case_name }} {{ registry_public_url_with_path }} --version {{ build_version }} {% if image_group_filter %} --filter {{ image_group_filter }} {% endif %}"
   register: ibmpak_gen1_result
 
 - name: "{{ case_name }} : Copy images-mapping"
@@ -109,7 +109,7 @@
 # 8. Generate mirror-manifest indirect
 # -----------------------------------------------------------------------------
 - name: "{{ case_name }} : Generate the mirror manifest from the CASE bundle (indirect)"
-  shell: "oc ibm-pak generate mirror-manifests {{ case_name }} file:// --version {{ build_version }} --final-registry {{ registry_public_url_with_path }} {% if image_group_filter is defined %} --filter {{ image_group_filter }} {% endif %}"
+  shell: "oc ibm-pak generate mirror-manifests {{ case_name }} file:// --version {{ build_version }} --final-registry {{ registry_public_url_with_path }} {% if image_group_filter %} --filter {{ image_group_filter }} {% endif %}"
   register: ibmpak_gen2_result
 
 - name: "{{ case_name }} : Copy images-mapping-to-filesystem"