From f4d0c8f226e316427b68bf82c76167ae818b1c0a Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 22 Aug 2022 15:21:34 +1000
Subject: [PATCH] nodepool-functional-openshift: update nodepool launcher to
 Fedora 36

Update to current Fedora so we can remove the old node types.

Change-Id: Iad0c18419616a962a973f41dfcf6ea8cb396d4a5
---
 .zuul.yaml                                       |  2 +-
 playbooks/nodepool-functional-openshift/pre.yaml | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index b36638c68..b11b0b4c0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -24,7 +24,7 @@
           label: centos-7
         # Runs nodepool
         - name: launcher
-          label: fedora-35
+          label: fedora-36
     required-projects:
       - zuul/nodepool
 
diff --git a/playbooks/nodepool-functional-openshift/pre.yaml b/playbooks/nodepool-functional-openshift/pre.yaml
index 3ac3cc323..4c6dc4ef8 100644
--- a/playbooks/nodepool-functional-openshift/pre.yaml
+++ b/playbooks/nodepool-functional-openshift/pre.yaml
@@ -16,10 +16,18 @@
       zookeeper_use_tls: true
     - role: ensure-tox
   tasks:
+    # NOTE(ianw) 2022-09-07 :
+    # Shipped packages do not work and we need to use this statically
+    # linked binary; see
+    #  https://issues.redhat.com/browse/OCPBUGS-559
     - name: Ensure oc client is installed
-      package:
-        name: origin-clients
-      become: yes
+      shell: |
+          CLIENT=openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit
+          wget https://github.com/openshift/origin/releases/download/v3.11.0/${CLIENT}.tar.gz
+          tar xvf ${CLIENT}.tar.gz
+          sudo mv ${CLIENT}/oc /usr/local/bin
+          sudo mv ${CLIENT}/kubectl /usr/local/bin
+          oc version
 
 - hosts: cluster
   roles: