Revert "Reorder again"

This reverts commit 79d03bf.
bmsiegel · Jun 24, 2024 · 9d0f319 · 9d0f319
1 parent 79d03bf
commit 9d0f319
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/on-safe-to-test-label.yml b/.github/workflows/on-safe-to-test-label.yml
@@ -8,22 +8,22 @@ on:
   workflow_dispatch:
 
 jobs:
-  run-for-x86:
+  run-for-arm:
     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')) }}
     uses: './.github/workflows/test-plugin.yml'
     with:
-      architecture: 'x86_64'
+      architecture: 'arm64'
 
-  run-for-arm:
+  run-for-x86:
     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')) }}
     uses: './.github/workflows/test-plugin.yml'
     with:
-      architecture: 'arm64'
-    needs: run-for-x86
+      architecture: 'x86_64'
+    needs: run-for-arm
 
   remove-safe-to-test:
     name: Remove Safe to Test Label
-    needs: run-for-arm
+    needs: run-for-x86
     runs-on: ubuntu-latest
     if: ${{ contains(github.event.pull_request.labels.*.name, 'safe to test') && !contains(github.event.pull_request.labels.*.name, 'lgtm') && always() }} # required to stop the runner even if the error happened in the previous jobs
     steps:

diff --git a/.github/workflows/test-plugin.yml b/.github/workflows/test-plugin.yml
@@ -46,7 +46,7 @@ jobs:
           mode: start
           github-token: GithubToken-brsiegel-us-east-1
           ec2-image-id: ${{ env.AMI }}
-          ec2-instance-type: ${{ env.EC2_IMAGE_TYPE }}
+          ec2-instance-type: ${{ env.EC2_IMAGE_TYPE }} 
           subnet-id: ${{ env.SUBNET_ID }}
           security-group-id: ${{ env.SG_ID }}
           iam-role-name: K8sPluginInstanceProfile-brsiegel-us-east-1
@@ -125,7 +125,7 @@ jobs:
           sudo systemctl restart docker
       - name: Install AWS CLI v2
         run: |
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-${{ env.AWS_CLI_ARCHITECTURE }}.zip" -o "awscliv2.zip"
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-${{ env.AWS_CLI_ARCHITECTURE }}.zip" -o "awscliv2.zip" 
           unzip awscliv2.zip
           sudo ./aws/install
       - name: Install kubectl