Merge "Modified container exclude list with distros"

roles/build-containers/defaults/main.yaml

@@ -42,3 +42,4 @@ registry_namespace: >-
   {%- endif -%}
 container_registry_image: quay.io/tripleoci/registry:2
 provider_registry_port: 5001
+container_exclude_distro: "{{ ansible_distribution|lower }}{{ ansible_distribution_major_version}}"

roles/build-containers/tasks/build-report.yaml

@@ -43,7 +43,7 @@
       shell: |
         set -eux
         echo {{ item }} >> {{ workspace }}/containers-excluded.log
-      with_items: "{{ exclude_containers[branch] }}"
+      with_items: "{{ exclude_containers[branch][container_exclude_distro] }}"
       when: exclude_containers is defined and branch in exclude_containers
 
     - name: Write containers-expected.log

roles/build-containers/templates/kolla-build.sh.j2

@@ -11,7 +11,7 @@ TRIPLEO_CI_PATH="{{ ansible_user_dir }}/src/opendev.org/openstack/tripleo-ci"
 ### build
 openstack overcloud container image build {{ container_config }}\
     {% if ci_branch not in ['queens'] and ci_branch in exclude_containers %}
-    {% for item in exclude_containers[ci_branch] %}
+    {% for item in exclude_containers[ci_branch][container_exclude_distro] %}
         --exclude {{ item }} \
     {% endfor %}
     {% endif %}

roles/build-containers/templates/tripleo-build.sh.j2

@@ -65,7 +65,7 @@ openstack tripleo container image build \
 {%   endif %}
 {%   set branch = osp_branch|default(ci_branch) %}
 {%   if branch in exclude_containers %}
-{%   for item in exclude_containers[branch] %}
+{%   for item in exclude_containers[branch][container_exclude_distro] %}
      --exclude {{ item }} \
 {%   endfor %}
 {%   endif %}

roles/build-containers/vars/main.yaml

@@ -14,48 +14,60 @@ virtualenv_python:
 # Current implementation assumes that any branch name not mentioned here
 # would default to the excludes defined on master branch.
 exclude_ppc_containers:
-  master: &exclude_ppc_master_containers
-    - ironic-pxe
-    - neutron-mlnx-agent
+  master:
+    centos8: &exclude_ppc_master_containers
+      - ironic-pxe
+      - neutron-mlnx-agent
 exclude_containers:
-  master: &exclude_master_containers
-    - fluentd
-    - opendaylight
-    - neutron-server-opendaylight
-    - neutron-mlnx-agent
-    - nova-serialproxy
-    - sahara-api
-    - sahara-engine
-    - skydive-agent
-    - skydive-analyzer
-    - sensu-client
-    - sensu-base
-    - influxdb
-    - tempest
-  wallaby: *exclude_master_containers
-  victoria: &exclude_containers
-    - fluentd
-    - opendaylight
-    - neutron-server-opendaylight
-    - neutron-mlnx-agent
-    - nova-serialproxy
-    - sahara-api
-    - sahara-engine
-    - skydive-agent
-    - skydive-analyzer
-    - sensu-client
-    - sensu-base
-    - influxdb
-  ussuri: *exclude_containers
-  train: *exclude_containers
+  master:
+    centos8: &exclude_master_containers
+      - fluentd
+      - opendaylight
+      - neutron-server-opendaylight
+      - neutron-mlnx-agent
+      - nova-serialproxy
+      - sahara-api
+      - sahara-engine
+      - skydive-agent
+      - skydive-analyzer
+      - sensu-client
+      - sensu-base
+      - influxdb
+      - tempest
+    centos9: *exclude_master_containers
+  wallaby:
+    centos8: *exclude_master_containers
+  victoria:
+    centos8: &exclude_containers
+      - fluentd
+      - opendaylight
+      - neutron-server-opendaylight
+      - neutron-mlnx-agent
+      - nova-serialproxy
+      - sahara-api
+      - sahara-engine
+      - skydive-agent
+      - skydive-analyzer
+      - sensu-client
+      - sensu-base
+      - influxdb
+  ussuri:
+    centos8: *exclude_containers
+  train:
+    centos7: *exclude_containers
+    centos8: *exclude_containers
   stein:
-    - opendaylight
-    - neutron-server-opendaylight
+    centos7:
+      - opendaylight
+      - neutron-server-opendaylight
   queens:
-    - opendaylight
-    - neutron-server-opendaylight
-  rhos-17: *exclude_master_containers
-  rhos-16.2: *exclude_containers
+    centos7:
+      - opendaylight
+      - neutron-server-opendaylight
+  rhos-17:
+    redhat8: *exclude_master_containers
+  rhos-16.2:
+    redhat8: *exclude_containers
 
 timestamper_cmd: >-
     | awk '{ print strftime("%Y-%m-%d %H:%M:%S |"), $0; fflush(); }'