Merge pull request #316 from bmsiegel/main

Update ec2 runner to al2023
cert-manager · Feb 2, 2024 · f930892 · f930892
2 parents ec3007b + ea49fa3
commit f930892
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.github/workflows/on-safe-to-test-label.yml b/.github/workflows/on-safe-to-test-label.yml
@@ -30,14 +30,14 @@ jobs:
           VPC_ID=$(aws ec2 describe-vpcs --filters 'Name=tag-key,Values=GithubActionsTesting' --query 'Vpcs[0].VpcId' --output text)
           SUBNET_ID=$(aws ec2 describe-subnets --filters "Name=vpc-id,Values=$VPC_ID" "Name=tag-key,Values=GithubActionsTesting"  --query 'Subnets[0].SubnetId' --output text)
           SG_ID=$(aws ec2 describe-security-groups --filters "Name=vpc-id,Values=$VPC_ID" "Name=tag-key,Values=GithubActionsTesting" --query 'SecurityGroups[0].GroupId' --output text)
-          AMI=$(aws ssm get-parameter --name /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2 --query 'Parameter.Value' --output text) 
+          AMI=$(aws ssm get-parameter --name /aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64 --query 'Parameter.Value' --output text)
           echo AWS_REGION=$AWS_REGION >> $GITHUB_ENV
           echo SUBNET_ID=$SUBNET_ID >> $GITHUB_ENV
           echo SG_ID=$SG_ID >> $GITHUB_ENV
           echo AMI=$AMI >> $GITHUB_ENV
       - name: Start EC2 runner
         id: start-ec2-runner
-        uses: divyansh-gupta/ec2-github-runner@82c9d554a7e7946be1b2003eaac45af59c9f78fd
+        uses: divyansh-gupta/ec2-github-runner@0444f5f46462bcf8d98932bc807d2f51c4945b58
         with:
           mode: start
           github-token: GithubToken-test-us-east-1
@@ -52,6 +52,8 @@ jobs:
               {"Key": "Name", "Value": "ec2-github-runner"},
               {"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
             ]
+          pre-runner-script: |
+            sudo yum install libicu -y
 
   do-the-job:
     if: ${{ (contains(github.event.pull_request.labels.*.name, 'safe to test') && !contains(github.event.pull_request.labels.*.name, 'lgtm')) || (contains(github.event_name, 'workflow_dispatch')) }}
@@ -107,7 +109,7 @@ jobs:
           key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
       - name: Install Docker
         run: |
-          sudo amazon-linux-extras install docker -y
+          sudo yum install docker -y
           sudo service docker start
       - name: Install AWS CLI v2
         run: |
@@ -117,7 +119,7 @@ jobs:
       - name: Install kubectl
         run: |
           curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-          sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl    
+          sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
       - name: Install Jq
         run: |
           sudo yum install jq -y
@@ -195,7 +197,7 @@ jobs:
           export E2E_ARTIFACTS_DIRECTORY=logs-blog
           make kind-export-logs
           aws s3 cp --recursive logs-blog s3://aws-privateca-issuer-k8s-logs-test-us-east-1/${{ needs.start-runner.outputs.ec2-instance-id }}-blog/
-          
+
   stop-runner:
     name: Stop self-hosted EC2 runner
     needs: