Merge "Use release file for C8 images"

playbooks/tripleo-buildcontainers/pre.yaml

@@ -19,8 +19,8 @@
       when:
         - ansible_pkg_mgr == "yum"
 
-    - name: Container Build for 8 specific distros
+    - name: Container Build for 7 specific distros
-      when: ansible_distribution_major_version is version(8, '<=')
+      when: ansible_distribution_major_version is version(7, '==')
       block:
         - name: Include tripleo-repos
           include_role:
@@ -60,7 +60,7 @@
             bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/python-tripleoclient'].src_dir }}"
 
     - name: Setup repos using repo-setup role and release file
-      when: ansible_distribution_major_version is version(9, '>=')
+      when: ansible_distribution_major_version is version(8, '>=')
       include_role:
         name: tripleo-build-jobs-repos
 

playbooks/tripleo-buildcontainers/run.yaml

@@ -3,8 +3,8 @@
   name: TripleO container image building job
   tasks:
 
-    - name: Re-run repo-setup and build for c9 (pickup mirrors set in pre)
+    - name: Re-run repo-setup and build for c8 and c9 (pickup mirrors set in pre)
-      when: ansible_distribution_major_version is version('9', '>=')
+      when: ansible_distribution_major_version is version('8', '>=')
       block:
         - name: Load vars from release file and set facts needed for repo-setup
           include_role:
@@ -16,7 +16,7 @@
           vars:
             repo_setup_dir: "{{ workspace }}"
             repo_setup_use_collections: false
-        - name: "build containers C9 for hash: {{ buildcontainers_version_hash }}"
+        - name: "build containers C8 and C9 for hash: {{ buildcontainers_version_hash }}"
           include_role:
             name: build-containers
           vars:
@@ -25,7 +25,7 @@
     - name: Run build containers tasks
       include_role:
         name: build-containers
-      when: ansible_distribution_major_version is version('8', '<=')
+      when: ansible_distribution_major_version is version('7', '==')
 
     - name: Fail job if it's configured
       fail:

playbooks/tripleo-buildimages/pre.yaml

@@ -20,12 +20,12 @@
         - ansible_pkg_mgr == "yum"
 
     - name: Setup repos using repo-setup role and release file
-      when: ansible_distribution_major_version is version(9, '>=')
+      when: ansible_distribution_major_version is version(8, '>=')
       include_role:
         name: tripleo-build-jobs-repos
 
     - name: Include tripleo-repos
-      when: ansible_distribution_major_version is version(8, '<=')
+      when: ansible_distribution_major_version is version(8, '<')
       include_role:
         name: tripleo-repos
       vars:

playbooks/tripleo-buildimages/run-v3.yaml

@@ -2,8 +2,8 @@
 - hosts: all
   tasks:
 
-  - name: Re-run the repo-setup role for c9 (after rdo mirror setup in pre)
+  - name: Re-run the repo-setup role for c8 and c9 (after rdo mirror setup in pre)
-    when: ansible_distribution_major_version is version('9', '>=')
+    when: ansible_distribution_major_version is version('8', '>=')
     block:
       - name: Load vars from release file and set facts needed for repo-setup
         include_role:

roles/oooci-build-images/defaults/main.yaml

@@ -36,9 +36,8 @@ dib_yum_repo_conf: >-
   {{ dib_yum_repo_conf_centos }}
   {%- endif %}
 dib_yum_repo_conf_centos:
-  - /etc/yum.repos.d/tripleo-centos*
+  - /etc/yum.repos.d/quickstart-centos*
   - /etc/yum.repos.d/delorean*
-  - /etc/yum.repos.d/CentOS*
 dib_yum_repo_conf_rhel:
   - /etc/yum.repos.d/rh-cloud.repo
   - /etc/yum.repos.d/delorean*

roles/tripleo-build-jobs-repos/defaults/main.yaml

@@ -0,0 +1,7 @@
+---
+rpm_packages:
+  - git
+  - python3
+  - python3-libselinux
+  - python3-setuptools
+#  - python3-venv

roles/tripleo-build-jobs-repos/tasks/main.yaml

@@ -1,4 +1,10 @@
 ---
+- name: Install system packages
+  become: true
+  package:
+    name: "{{ rpm_packages }}"
+    state: present
+
 - name: Load vars from release file and set facts needed for repo-setup
   include_tasks: load-vars.yaml
 
@@ -7,6 +13,7 @@
   package:
     name: python3-pip
     state: absent
+  when: ansible_distribution_major_version is version('8', '>')
 
 - name: Get pip needed for tripleo-repos installation
   include_role:
@@ -18,7 +25,7 @@
 - name: install tripleo-repos from git checkout
   shell: |
     pushd "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/tripleo-repos'].src_dir }}"
-    python setup.py install --user
+    python3 setup.py install --user
     popd
   failed_when: false
   changed_when: true
@@ -29,6 +36,7 @@
   vars:
     repo_setup_dir: "{{ workspace }}"
     repo_setup_use_collections: false
+    use_yum_config_module: false
 
 - name: Install python3-tripleoclient python3-virtualenv
   become: true

zuul.d/base.yaml

@@ -801,7 +801,12 @@
       - opendev.org/openstack/tripleo-puppet-elements
       - opendev.org/openstack/tripleo-repos
       - opendev.org/openstack/requirements
+      - opendev.org/openstack/tripleo-quickstart
+      - opendev.org/openstack/tripleo-quickstart-extras
     irrelevant-files: *irrelevant_build_img
+    roles:
+      - zuul: opendev.org/openstack/tripleo-quickstart
+      - zuul: opendev.org/openstack/tripleo-quickstart-extras
 
 - job:
     name: tripleo-build-images-base-centos-9