From 55ca357e39503999d58f5edc8b13f00be7235463 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Sat, 13 Feb 2021 21:38:16 +0000
Subject: [PATCH] ensure-openshift: workaround missing ansible26 repository

This change shortcirtcuits openshift repository installation to avoid
pulling the ansible26 repository.

Change-Id: I912a03e6502627340d002b419514f1ebdffb61e5
---
 roles/ensure-openshift/defaults/main.yaml | 10 +++++
 roles/ensure-openshift/tasks/main.yaml    | 55 +++++++++++++++++++++--
 zuul-tests.d/container-roles-jobs.yaml    |  1 +
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/roles/ensure-openshift/defaults/main.yaml b/roles/ensure-openshift/defaults/main.yaml
index 09fa482a5..db5aa3170 100644
--- a/roles/ensure-openshift/defaults/main.yaml
+++ b/roles/ensure-openshift/defaults/main.yaml
@@ -1,2 +1,12 @@
 origin_repo: centos-release-openshift-origin311
 origin_version: v3.11.0
+origin_repos:
+  v3.11: 311
+  v3.10: 310
+  v3.9: 39
+  v3.8: 38
+  v3.7: 37
+  v3.6: 36
+  v1.5: 15
+  v1.4: 14
+  v1.3: 13
diff --git a/roles/ensure-openshift/tasks/main.yaml b/roles/ensure-openshift/tasks/main.yaml
index 04670233a..f176a3daf 100644
--- a/roles/ensure-openshift/tasks/main.yaml
+++ b/roles/ensure-openshift/tasks/main.yaml
@@ -1,7 +1,54 @@
-- name: Install origin repository
-  yum:
-    name: "{{ origin_repo }}"
-  become: yes
+- name: "Compute origin repo name"
+  set_fact:
+    origin_repo_name: "{{ origin_repos[origin_version.split('.')[:-1] | join('.') | default('unknown')] }}"
+
+- name: "Fail if repo name is undefined"
+  fail:
+    msg: |
+      Unknown openshift version: {{ origin_version }}.
+      It needs to be defined in {{ opendev_url }}/roles/ensure-openshift/defaults/main.yaml
+  when: origin_repo_name == 'unknown'
+  vars:
+    opendev_url: https://opendev.org/zuul/zuul-jobs/src/branch/master/
+
+- name: "Install origin{{ origin_repo_name }} pass repository"
+  become: true
+  copy:
+    content: |
+      [centos-openshift-origin{{ origin_repo_name }}]
+      name=CentOS OpenShift Origin
+      baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin{{ origin_repo_name }}/
+      enabled=1
+      gpgcheck=1
+      gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
+    dest: /etc/yum.repos.d/origin-pass.repo
+
+# https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-PaaS
+- name: "Install RPM-GPG-KEY-CentOS-SIG-PaaS"
+  become: true
+  copy:
+    content: |
+      -----BEGIN PGP PUBLIC KEY BLOCK-----
+      Version: GnuPG v2.0.22 (GNU/Linux)
+
+      mQENBFc8iwUBCADadBGYmA2nFvq79/5uxUQOiPqC/QflWcPX1B6SQKniUhyqaSes
+      gNMJsPppKRV4NZKITcL8lZ90+Gds0fmL3b5xz1r5Rfm3ilSItEqeGlLIJZBvANyx
+      rAT3q8EgkkVRyhZPseUMZj04O8OKnt1jrHakVkOp0lJClqhZ+bs/7yLRmaLXTcum
+      +ouqUKzQoAEDnqe9nJmmJhC6n2vg7o0PCo/9qOf/scQbv4FNoJfmkcVLRmwmqzgh
+      bGj6QaOgij3sl94pZ3HFop4f+eU0kNbyt9J18fKI8X0DdHkDW8kO1UwwHT2ibJ1t
+      mBaUsE1zZ0DvfyFad1xXAgm+SIlJgdpPvPNLABEBAAG0WUNlbnRPUyBQYWFTIFNJ
+      RyAoaHR0cHM6Ly93aWtpLmNlbnRvcy5vcmcvU3BlY2lhbEludGVyZXN0R3JvdXAv
+      UGFhUykgPHNlY3VyaXR5QGNlbnRvcy5vcmc+iQE5BBMBAgAjBQJXPIsFAhsDBwsJ
+      CAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQw0xb1C8pfsyT2gf9FqJoc8oZ+T5A
+      8cZslMyCWziPi0o7kd/Rw91T7dkV+VIC+sFlVga7fkPEAiD8U7JFE+a1IlcjfGuY
+      my4S6UH8K5zL36CRg2MF112HE5TWoBxF3KZg9nOJQ2NLapJowaP8uITYG4vlgV3g
+      GJD2OC191tjcqmelFnhAN0EBdxrRrBJ7tr3OCtL6bJ6NPQ0bXPI2Fjbm7SbxTfpE
+      ggEU8R7WZQApYgl8zRfyS12SfpFV8ZU+lIBmJaU1qaY4/BmNgG6e7clmq8xVZQLg
+      ZH9qi9+HPh+80+8/WhJUddlVXc2g6c4VjnnFpZfsrMdTAFuEsrjkyaxqeBjXCgbb
+      pzGjTg0LXg==
+      =CVSF
+      -----END PGP PUBLIC KEY BLOCK-----
+    dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
 
 - name: Install requirements
   yum:
diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml
index 2b171718f..bd4cd53b7 100644
--- a/zuul-tests.d/container-roles-jobs.yaml
+++ b/zuul-tests.d/container-roles-jobs.yaml
@@ -248,6 +248,7 @@
       - roles/push-to-intermediate-registry/.*
       - roles/ensure-docker/.*
       - roles/ensure-kubernetes/.*
+      - roles/ensure-openshift/.*
       - roles/ensure-package-repositories/.*
       - roles/build-docker-image/.*
       - roles/run-buildset-registry/.*