From 4af1f7007d39b02f960f747e7abd626dec9117fd Mon Sep 17 00:00:00 2001
From: Ryan Emerson <remerson@redhat.com>
Date: Tue, 15 Oct 2024 17:43:37 +0100
Subject: [PATCH] AuroraDB IT - Error creating EC2 runner instance

Closes #33874

- Use venv to install python dependencies
- Utilise latest ansible version
- Utilise RHEL 9 image to update python versions

Signed-off-by: Ryan Emerson <remerson@redhat.com>
---
 .github/scripts/ansible/aws_ec2.sh                      | 2 +-
 .github/scripts/ansible/roles/aws_ec2/defaults/main.yml | 3 ++-
 .github/workflows/ci.yml                                | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/ansible/aws_ec2.sh b/.github/scripts/ansible/aws_ec2.sh
index 82e72f96594..4754e2141da 100755
--- a/.github/scripts/ansible/aws_ec2.sh
+++ b/.github/scripts/ansible/aws_ec2.sh
@@ -13,7 +13,7 @@ CLUSTER_NAME=$3
 case $OPERATION in
   requirements)
     ansible-galaxy collection install -r requirements.yml
-    pip3 install --user "ansible==9.*" boto3 botocore
+    pip3 install ansible boto3 botocore
   ;;
   create|delete|start|stop)
     if [ -f "env.yml" ]; then ANSIBLE_CUSTOM_VARS_ARG="-e @env.yml"; fi
diff --git a/.github/scripts/ansible/roles/aws_ec2/defaults/main.yml b/.github/scripts/ansible/roles/aws_ec2/defaults/main.yml
index 4d39bb9a713..acb1d92cd02 100644
--- a/.github/scripts/ansible/roles/aws_ec2/defaults/main.yml
+++ b/.github/scripts/ansible/roles/aws_ec2/defaults/main.yml
@@ -4,7 +4,8 @@ cluster_size: 1
 
 cidr_ip: "{{ control_host_ip.stdout }}/32"
 
-ami_name: RHEL-8.8.0_HVM-20230503-x86_64-54-Hourly2-GP2
+# aws ec2 describe-images --owners 309956199498 --filters "Name=architecture,Values=x86_64" "Name=virtualization-type,Values=hvm"  --region eu-west-1 --no-include-deprecated     --query 'Images[] | sort_by(@, &CreationDate)[].Name'
+ami_name: RHEL-9.4_HVM_GA-20240827-x86_64-0-Hourly2-GP3
 
 instance_type: t3.large
 instance_volume_size: 20
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 841ace65447..62774e82846 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -459,7 +459,10 @@ jobs:
           zip -u /tmp/keycloak.zip aws.pem
  
           cd .github/scripts/ansible
+          python3 -m venv .venv
+          source .venv/bin/activate
           ./aws_ec2.sh requirements
+          pipx inject ansible-core boto3 botocore
           ./aws_ec2.sh create ${AWS_REGION} ${EC2_CLUSTER_NAME}
           ./keycloak_ec2_installer.sh ${AWS_REGION} ${EC2_CLUSTER_NAME} /tmp/keycloak.zip
           ./mvn_ec2_runner.sh ${AWS_REGION} ${EC2_CLUSTER_NAME} "clean install -B -DskipTests -Pdistribution"
@@ -557,6 +560,7 @@ jobs:
         if: always()
         working-directory: .github/scripts/ansible
         run: |
+          source .venv/bin/activate
           ./aws_ec2.sh delete ${{ steps.aurora-init.outputs.region }} ${{ steps.ec2-create.outputs.ec2_cluster }}
 
       - name: Delete Aurora DB