diff --git a/.github/scripts/ansible/aws_ec2.sh b/.github/scripts/ansible/aws_ec2.sh index d6ab3c03213..a78a890611b 100755 --- a/.github/scripts/ansible/aws_ec2.sh +++ b/.github/scripts/ansible/aws_ec2.sh @@ -12,7 +12,7 @@ REGION=$2 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 e067f775b19..b656ebdaa66 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -366,9 +366,12 @@ jobs: zip -u /tmp/keycloak.zip aws.pem cd .github/scripts/ansible + python3 -m venv .venv + source .venv/bin/activate export CLUSTER_NAME=keycloak_$(git rev-parse --short HEAD) echo "ec2_cluster=${CLUSTER_NAME}" >> $GITHUB_OUTPUT ./aws_ec2.sh requirements + pipx inject ansible-core boto3 botocore ./aws_ec2.sh create ${REGION} ./keycloak_ec2_installer.sh ${REGION} /tmp/keycloak.zip ./mvn_ec2_runner.sh ${REGION} "clean install -B -DskipTests -Pdistribution" @@ -415,6 +418,7 @@ jobs: if: ${{ always() && matrix.db == 'aurora-postgres' }} working-directory: .github/scripts/ansible run: | + source .venv/bin/activate export CLUSTER_NAME=${{ steps.aurora-tests.outputs.ec2_cluster }} ./aws_ec2.sh delete ${{ steps.aurora-init.outputs.region }}