Merge pull request #38 from ansvu/avu-changes

Added missing default values and filter archived
redhatci · Nov 9, 2023 · c7c1949 · c7c1949
2 parents e3c6f3e + 0f2bd60
commit c7c1949
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/roles/create_helmchart/defaults/main.yml b/roles/create_helmchart/defaults/main.yml
@@ -0,0 +1,4 @@
+page_size: 200
+verify_project_url: "https://catalog.redhat.com/api/containers/v1/vendors/org-id"
+published: false
+...
diff --git a/roles/create_helmchart/tasks/get_all_helm_chart_projects_basedon_product_list_id.yml b/roles/create_helmchart/tasks/get_all_helm_chart_projects_basedon_product_list_id.yml
@@ -23,7 +23,7 @@
   set_fact:
     all_helmchart_projects: "{{ cert_project_list_output.json.data | json_query(query) + [new_helmchart_projects] | flatten }}"
   vars:
-    query: "[?product_listings[0] == '{{ cert_listings.pyxis_product_list_identifier }}'] | []._id"
+    query: "[?product_listings[0] == '{{ cert_listings.pyxis_product_list_identifier }}' && project_status != 'archived'] | []._id"
   when:
     - cert_project_list_output | length > 0
     - new_helmchart_projects is defined

diff --git a/roles/openshift_cnf/defaults/main.yml b/roles/openshift_cnf/defaults/main.yml
@@ -1,2 +1,4 @@
 ---
-verify_project_url: "https://catalog.redhat.com/api/containers/v1/vendors/org-id"
+verify_project_url: "https://catalog.redhat.com/api/containers/v1/vendors/org-id"
+page_size: 200
+...
diff --git a/roles/openshift_cnf/tasks/get_all_openshift_cnf_projects_basedon_product_list_id.yml b/roles/openshift_cnf/tasks/get_all_openshift_cnf_projects_basedon_product_list_id.yml
@@ -23,7 +23,7 @@
   set_fact:
     all_openshift_cnf_projects: "{{ cert_project_list_output.json.data | json_query(query) + [new_openshift_cnf_projects] | flatten }}"
   vars:
-    query: "[?product_listings[0] == '{{ cert_listings.pyxis_product_list_identifier }}'] | []._id"
+    query: "[?product_listings[0] == '{{ cert_listings.pyxis_product_list_identifier }}' && project_status != 'archived'] | []._id"
   when:
     - cert_project_list_output | length > 0
     - new_openshift_cnf_projects is defined