From 37deb1347c95921840f96eea70ae644b1a15c8e7 Mon Sep 17 00:00:00 2001
From: Matthew Sandoval <mat24c@gmail.com>
Date: Wed, 4 Oct 2023 11:30:42 -0700
Subject: [PATCH] Update execution enviornment to v3 (#299)

* Update execution enviornment to v3

* Add fragment

* Update minimum runtime

* Change EE core version

* update runtime to supported version

* Remove rhel 8.8 devel tests

* Removed unmaintained ansible versions
---
 .azure-pipelines/azure-pipelines.yml          | 88 +++++++++----------
 ...99-update-execustion-enviornment-to-v3.yml |  3 +
 execution-environment.yml                     | 15 ++--
 meta/runtime.yml                              |  2 +-
 4 files changed, 58 insertions(+), 50 deletions(-)
 create mode 100644 changelogs/fragments/299-update-execustion-enviornment-to-v3.yml

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index b59b2db4..c58b6dc9 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -134,32 +134,32 @@ stages:
               test: sanity
             - name: Units
               test: units
-  - stage: Sanity_2_14
-    displayName: Ansible 2.14 sanity
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: "{0}"
-          testFormat: "2.14/{0}"
-          targets:
-            - name: Sanity
-              test: sanity
-            - name: Units
-              test: units
-  - stage: Sanity_2_13
-    displayName: Ansible 2.13 sanity
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: "{0}"
-          testFormat: "2.13/{0}"
-          targets:
-            - name: Sanity
-              test: sanity
-            - name: Units
-              test: units
+  # - stage: Sanity_2_14
+  #   displayName: Ansible 2.14 sanity
+  #   dependsOn: []
+  #   jobs:
+  #     - template: templates/matrix.yml
+  #       parameters:
+  #         nameFormat: "{0}"
+  #         testFormat: "2.14/{0}"
+  #         targets:
+  #           - name: Sanity
+  #             test: sanity
+  #           - name: Units
+  #             test: units
+  # - stage: Sanity_2_13
+  #   displayName: Ansible 2.13 sanity
+  #   dependsOn: []
+  #   jobs:
+  #     - template: templates/matrix.yml
+  #       parameters:
+  #         nameFormat: "{0}"
+  #         testFormat: "2.13/{0}"
+  #         targets:
+  #           - name: Sanity
+  #             test: sanity
+  #           - name: Units
+  #             test: units
 
   ## Remote tests
   # Integration tests (RECOMMENDED)
@@ -191,8 +191,8 @@ stages:
           targets:
             - name: RHEL 9.2
               test: rhel/9.2/
-            - name: RHEL 8.8
-              test: rhel/8.8/
+            # - name: RHEL 8.8
+            #   test: rhel/8.8/
           groups:
             - 1
       # FIXME - ami is currently broken in CI
@@ -220,8 +220,8 @@ stages:
           targets:
             - name: RHEL 9.2 edge-commit
               test: rhel/9.2/
-            - name: RHEL 8.8 edge-commit
-              test: rhel/8.8/
+            # - name: RHEL 8.8 edge-commit
+            #   test: rhel/8.8/
           groups:
             - 4
       - template: templates/matrix.yml
@@ -230,8 +230,8 @@ stages:
           targets:
             - name: RHEL 9.2 edge-container
               test: rhel/9.2/
-            - name: RHEL 8.8 edge-container
-              test: rhel/8.8/
+            # - name: RHEL 8.8 edge-container
+            #   test: rhel/8.8/
           groups:
             - 5
 
@@ -325,8 +325,8 @@ stages:
           targets:
             - name: RHEL 9.2 oci
               test: rhel/9.2/
-            - name: RHEL 8.8 oci
-              test: rhel/8.8/
+            # - name: RHEL 8.8 oci
+            #   test: rhel/8.8/
           groups:
             - 14
       - template: templates/matrix.yml
@@ -335,8 +335,8 @@ stages:
           targets:
             - name: RHEL 9.2 openstack
               test: rhel/9.2/
-            - name: RHEL 8.8 openstack
-              test: rhel/8.8/
+            # - name: RHEL 8.8 openstack
+            #   test: rhel/8.8/
           groups:
             - 15
       - template: templates/matrix.yml
@@ -345,8 +345,8 @@ stages:
           targets:
             - name: RHEL 9.2 qcow2
               test: rhel/9.2/
-            - name: RHEL 8.8 qcow2
-              test: rhel/8.8/
+            # - name: RHEL 8.8 qcow2
+            #   test: rhel/8.8/
           groups:
             - 16
       - template: templates/matrix.yml
@@ -355,8 +355,8 @@ stages:
           targets:
             - name: RHEL 9.2 tar
               test: rhel/9.2/
-            - name: RHEL 8.8 tar
-              test: rhel/8.8/
+            # - name: RHEL 8.8 tar
+            #   test: rhel/8.8/
           groups:
             - 17
       - template: templates/matrix.yml
@@ -365,8 +365,8 @@ stages:
           targets:
             - name: RHEL 9.2 vhd
               test: rhel/9.2/
-            - name: RHEL 8.8 vhd
-              test: rhel/8.8/
+            # - name: RHEL 8.8 vhd
+            #   test: rhel/8.8/
           groups:
             - 18
       - template: templates/matrix.yml
@@ -375,8 +375,8 @@ stages:
           targets:
             - name: RHEL 9.2 vmdk
               test: rhel/9.2/
-            - name: RHEL 8.8 vmdk
-              test: rhel/8.8/
+            # - name: RHEL 8.8 vmdk
+            #   test: rhel/8.8/
           groups:
             - 19
 
diff --git a/changelogs/fragments/299-update-execustion-enviornment-to-v3.yml b/changelogs/fragments/299-update-execustion-enviornment-to-v3.yml
new file mode 100644
index 00000000..fc488631
--- /dev/null
+++ b/changelogs/fragments/299-update-execustion-enviornment-to-v3.yml
@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - Update execution enviornment to v3
diff --git a/execution-environment.yml b/execution-environment.yml
index e6c3d604..146f67d8 100644
--- a/execution-environment.yml
+++ b/execution-environment.yml
@@ -1,8 +1,13 @@
 ---
-version: 1
-
-build_arg_defaults:
-  EE_BASE_IMAGE: 'quay.io/ansible/ansible-runner:latest'
+version: 3
 
 dependencies:
-  galaxy: build_context/_build/requirements.yml
+  ansible_core:
+    package_pip: ansible-core==2.12.8
+  ansible_runner:
+    package_pip: ansible-runner
+  galaxy: requirements.yml
+
+images:
+  base_image:
+    name: docker.io/redhat/ubi9:latest
diff --git a/meta/runtime.yml b/meta/runtime.yml
index c467dd7b..bb7e832f 100644
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -1,2 +1,2 @@
 ---
-requires_ansible: ">=2.12.0"
+requires_ansible: ">=2.15.4"