add ocp clients per https://access.redhat.com/node/7024259/draft

RedHatGov · Aug 23, 2023 · 4d8c765 · 4d8c765
1 parent c718401
commit 4d8c765
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/product-demos-ee/execution-environment.yml b/product-demos-ee/execution-environment.yml
@@ -1,5 +1,5 @@
 ---
-version: 1
+version: 3
 
 build_arg_defaults:
   EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-22/ee-minimal-rhel8:latest'
@@ -10,9 +10,16 @@ dependencies:
   galaxy: requirements.yml
   python: requirements.txt
 
+additional_build_files:
+   - src: openshift-clients-4.12.0-202308011802.p0.g8669c6d.assembly.stream.el8.x86_64.rpm
+     dest: rpms
+
 additional_build_steps:
-  prepend: |
-    RUN pip3 install --upgrade pip setuptools
-  append: |
-    LABEL quay.expires-after="45d"
- 
+  prepend_base:
+    - COPY _build/rpms/*.rpm /tmp/openshift-clients.rpm
+    - RUN $PKGMGR install bash-completion
+    - RUN rpm -ivh /tmp/openshift-clients.rpm
+  prepend:
+    - RUN pip3 install --upgrade pip setuptools
+  append:
+    - LABEL quay.expires-after="45d"
diff --git a/...demos-ee/openshift-clients-4.12.0-202308011802.p0.g8669c6d.assembly.stream.el8.x86_64.rpm b/...demos-ee/openshift-clients-4.12.0-202308011802.p0.g8669c6d.assembly.stream.el8.x86_64.rpm
diff --git a/product-demos-ee/requirements.yml b/product-demos-ee/requirements.yml
@@ -36,7 +36,7 @@ collections:
   - name: ansible.netcommon
     version: 5.0.0
   #openshift
-  #- name: redhat.openshift
-  #  version: 2.3.0
-  #- name: kubernetes.core
-  #  version: 2.4.0
+  - name: redhat.openshift
+    version: 2.3.0
+  - name: kubernetes.core
+    version: 2.4.0