Merge "Modifying catalogue execution test to resolve component pipeline issue"

roles/validations/defaults/main.yaml

@@ -17,3 +17,4 @@ validation_component: "{{ job.component|default('validation') }}"
 cli_command: "validation"
 run_validation: true
 execute_full_vf_catalogue: "{{ job.execute_full_vf_catalogue|default(false)|bool }}"
+vf_catalogue_overrides: "{{ ansible_user_dir }}/catalog_vars_override.yaml"

roles/validations/files/catalog_vars_override.yaml

@@ -0,0 +1,11 @@
+---
+# LP#1959864
+volumes:
+  - {mount: /var/lib/docker, min_size: 10}
+  - {mount: /var/lib/config-data, min_size: 3}
+  - {mount: /var/log, min_size: 3}
+  - {mount: /usr, min_size: 5}
+  - {mount: /var, min_size: 8}
+  - {mount: /, min_size: 8}
+
+minimal_ram_gb: 2

roles/validations/tasks/execute_full_catalogue.yaml

@@ -12,4 +12,5 @@
       --output-log validation_catalogue_execution.log
       {{ validation_catalogue.extra_args }}
       {{ validation_catalogue.extra_env_args }}
+      --extra-vars-file={{ vf_catalogue_overrides }}
     executable: /bin/bash

roles/validations/tasks/main.yaml

@@ -115,6 +115,15 @@
     - validation_component | length > 0
   with_dict: "{{ validations_list[validation_component] }}"
 
+- name: Import variable overrides
+  become: true
+  copy:
+    src: files/catalog_vars_override.yaml
+    dest: "{{ vf_catalogue_overrides }}"
+    mode: "0644"
+    owner: "{{ ansible_user }}"
+    group: "{{ ansible_user }}"
+
 - name: Execute entire validations catalogue
   include_tasks: execute_full_catalogue.yaml
   when: execute_full_vf_catalogue

roles/validations/vars/main.yaml

@@ -65,7 +65,7 @@ validation_list_formats:
 # extra_env_args and extra_args are shared for the execution
 # Included validations will be sorted alphabetically.
 validation_catalogue:
-  extra_args: "--extra-vars minimal_ram_gb=2"
+  extra_args: ""
   extra_env_args: "{{ extra_env_vars | default('') }}"
   full_list:
     - 512e
@@ -86,7 +86,6 @@ validation_catalogue:
     - dhcp-provisioning
     - dns
     - healthcheck-service-status
-    - image-serve
     - mysql-open-files-limit
     - neutron-sanity-check
     - no-op
@@ -149,3 +148,5 @@ validation_catalogue:
 #    - tls-everywhere-prep
 #    - undercloud-debug
 #    - undercloud-service-status
+# LP#1959864
+#    - image-serve