fix up

Signed-off-by: Sam Yuan <[email protected]>

Author: SamYuan1990

.github/workflows/ci.yml

@@ -11,6 +11,41 @@ permissions:
   contents: read
 
 jobs:
+
+test-docker:
+    name: Docker Tests
+    runs-on: ubuntu-latest
+
+    # Run a local registry to push to
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5001:5000
+
+    env:
+      TEST_TAG: localhost:5001/sustainable_computing_io/aws_ec2_self_hosted_runner:latest
+
+    steps:
+      - name: Checkout
+        id: checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Docker BuildX
+        id: setup-buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          install: true
+          driver-opts: network=host
+
+      - name: Build the Container
+        id: build
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ env.TEST_TAG }}
+
   unitpreOS:
     strategy:
       matrix:
@@ -25,5 +60,6 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         GH_SELF_HOSTED_RUNNER_TOKEN: ${{ secrets.GH_SELF_HOSTED_RUNNER_TOKEN }}
+        AWS_SECURITY_GROUP_ID: ${{ secrets.AWS_SECURITY_GROUP_ID }}
         AMI_ID:  ${{matrix.AMI_ID}}
 

.github/workflows/ci_unit.yml

@@ -10,6 +10,8 @@ on:
         required: true
       AWS_SECRET_ACCESS_KEY:
         required: true
+      AWS_SECURITY_GROUP_ID:
+        required: true
       AMI_ID:
         required: true
       GH_SELF_HOSTED_RUNNER_TOKEN:
@@ -19,41 +21,6 @@ permissions:
   contents: read
 
 jobs:
-  test-docker:
-    name: Docker Tests
-    runs-on: ubuntu-latest
-
-    # Run a local registry to push to
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5001:5000
-
-    env:
-      TEST_TAG: localhost:5001/sustainable_computing_io/aws_ec2_self_hosted_runner:latest
-
-    steps:
-      - name: Checkout
-        id: checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Docker BuildX
-        id: setup-buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          install: true
-          driver-opts: network=host
-
-      - name: Build the Container
-        id: build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ env.TEST_TAG }}
-
-
   setup-runner:
     name: GitHub Actions Test create instance
     runs-on: ubuntu-latest