Moved to SSM

valkey-io · Mar 17, 2024 · 928ec25 · 928ec25
1 parent f44400f
commit 928ec25
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 52 deletions.
diff --git a/.github/workflows/npm-cd.yml b/.github/workflows/npm-cd.yml
@@ -7,6 +7,7 @@ on:
       paths:
         - .github/workflows/npm-cd.yml
         - .github/workflows/build-node-wrapper/action.yml
+        - .github/workflows/start-self-hosted-runner/action.yml
     push:
         tags:
             - "v*.*"
@@ -16,7 +17,23 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
+    start-self-hosted-runner:
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+          with:
+              submodules: "true"
+        - name: Start self hosted EC2 runner
+          uses: ./.github/workflows/start-self-hosted-runner
+          with:
+              aws-access-key-id: ${{ secrets.AWS_EC2_ACCESS_KEY_ID }}
+              aws-secret-access-key: ${{ secrets.AWS_EC2_SECRET_ACCESS_KEY }}
+              aws-region: ${{ secrets.AWS_REGION }}
+              ec2-instance-id: ${{ secrets.AWS_EC2_INSTANCE_ID }}
+
     publish-binaries:
+        needs: start-self-hosted-runner
         if: github.repository_owner == 'aws'
         name: Publish packages to NPM
         runs-on: ${{ matrix.build.RUNNER }}
@@ -54,6 +71,10 @@ jobs:
                           TARGET: aarch64-apple-darwin,
                       }
         steps:
+            - name: Cleanup self-hosted runner
+              if: ${{ contains(matrix.build.RUNNER, 'self-hosted') }}
+              run: sudo rm -rf /home/ubuntu/actions-runner/_work/glide-for-redis/glide-for-redis/node/target/
+
             - name: Checkout
               uses: actions/checkout@v4
               with:

diff --git a/.github/workflows/pypi-cd.yml b/.github/workflows/pypi-cd.yml
@@ -7,50 +7,36 @@ on:
       paths:
         - .github/workflows/pypi-cd.yml
         - .github/workflows/build-python-wrapper/action.yml
+        - .github/workflows/start-self-hosted-runner/action.yml
     push:
         tags:
             - "v*.*"
 
 concurrency:
     group: pypi-${{ github.head_ref || github.ref }}
     cancel-in-progress: true
-permissions: write-all
 
 jobs:
     start-self-hosted-runner:
-      name: Start self hosted EC2 runner
-      runs-on: ubuntu-latest
-      outputs:
-        label: ${{ steps.start-ec2-runner.outputs.label }}
-        ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
-      steps:
-        - name: Configure AWS Credentials
-          uses: aws-actions/configure-aws-credentials@v4
-          with:
-            aws-access-key-id: ${{ secrets.AWS_EC2_ACCESS_KEY_ID }}
-            aws-secret-access-key: ${{ secrets.AWS_EC2_SECRET_ACCESS_KEY }}
-            aws-region: ${{ secrets.AWS_REGION }}
-        - name: Start EC2 runner
-          id: start-ec2-runner
-          uses: machulav/ec2-github-runner@v2
-          with:
-            mode: start
-            github-token: ${{ secrets.GITHUB_TOKEN }}
-            ec2-image-id: ami-03831836fb1f65aac
-            ec2-instance-type: m6g.xlarge
-            subnet-id: subnet-0a88f7abc7e1490e1
-            security-group-id: sg-05024f40170e648f0
-            iam-role-name: github-actions-role 
-            aws-resource-tags: >
-              [
-                {"Key": "Name", "Value": "ec2-github-runner"},
-                {"Key": "GitHubRepository", "Value": "${{ github.repository }}"}  
-              ]
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout
+            uses: actions/checkout@v4
+            with:
+                submodules: "true"
+          - name: Start self hosted EC2 runner
+            uses: ./.github/workflows/start-self-hosted-runner
+            with:
+                aws-access-key-id: ${{ secrets.AWS_EC2_ACCESS_KEY_ID }}
+                aws-secret-access-key: ${{ secrets.AWS_EC2_SECRET_ACCESS_KEY }}
+                aws-region: ${{ secrets.AWS_REGION }}
+                ec2-instance-id: ${{ secrets.AWS_EC2_INSTANCE_ID }}
+
     publish-binaries:
         needs: start-self-hosted-runner
         if: github.repository_owner == 'aws'
         name: Publish packages to PyPi
-        runs-on: ${{ matrix.build.RUNNER == 'self-hosted' && needs.start-self-hosted-runner.outputs.label || matrix.build.RUNNER }}
+        runs-on: ${{ matrix.build.RUNNER }}
         strategy:
             fail-fast: false
             matrix:
@@ -65,7 +51,7 @@ jobs:
                     - {
                           OS: ubuntu-latest,
                           NAMED_OS: linux,
-                          RUNNER: self-hosted,
+                          RUNNER: [self-hosted, Linux, ARM64],
                           ARCH: arm64,
                           TARGET: aarch64-unknown-linux-gnu,
                           CONTAINER: "2_28",
@@ -85,6 +71,9 @@ jobs:
                           TARGET: aarch64-apple-darwin,
                       }
         steps:
+            - name: Cleanup self-hosted runner
+              if: ${{ contains(matrix.build.RUNNER, 'self-hosted') }}
+              run: sudo rm -rf /home/ubuntu/actions-runner/_work/glide-for-redis/glide-for-redis/python/target/
             - name: Checkout
               uses: actions/checkout@v4
               with:
@@ -201,24 +190,3 @@ jobs:
               with:
                   command: upload
                   args: --skip-existing python/wheels/*
-    stop-runner:
-      name: Stop self-hosted EC2 runner
-      needs:
-        - start-self-hosted-runner # required to get output from the start-runner job
-        - publish-to-pypi # required to wait when the main job is done
-      runs-on: ubuntu-latest
-      if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
-      steps:
-        - name: Configure AWS Credentials
-          uses: aws-actions/configure-aws-credentials@v4
-          with:
-            aws-access-key-id: ${{ secrets.AWS_EC2_ACCESS_KEY_ID }}
-            aws-secret-access-key: ${{ secrets.AWS_EC2_SECRET_ACCESS_KEY }}
-            aws-region: ${{ secrets.AWS_REGION }}
-        - name: Stop EC2 runner
-          uses: machulav/ec2-github-runner@v2
-          with:
-            mode: stop
-            github-token: ${{ secrets.GITHUB_TOKEN }}
-            label: ${{ needs.start-self-hosted-runner.outputs.label }}
-            ec2-instance-id: ${{ needs.start-self-hosted-runner.outputs.ec2-instance-id }}
diff --git a/.github/workflows/start-self-hosted-runner/action.yml b/.github/workflows/start-self-hosted-runner/action.yml
@@ -0,0 +1,32 @@
+name: Start self hosted EC2 runner
+
+inputs:
+    aws-region:
+        description: AWS Region, e.g. us-east-1
+        required: true
+    aws-access-key-id:
+        description: AWS Access Key ID. Provide this key if you want to assume a role using access keys rather than a web identity token.
+        required: true
+    aws-secret-access-key:
+        description: AWS Secret Access Key. Required if aws-access-key-id is provided.
+        required: true
+    ec2-instance-id:
+        description: AWS EC2 instance ID for the self hosted runner
+        required: true
+
+runs:
+    using: "composite"
+    steps:
+        - name: Configure AWS Credentials
+          uses: aws-actions/configure-aws-credentials@v4
+          with:
+              aws-access-key-id: ${{ inputs.aws-access-key-id }}
+              aws-secret-access-key: ${{ inputs.aws-secret-access-key }}
+              aws-region: ${{ inputs.aws-region }}
+        - name: Start EC2 self hosted runner
+          shell: bash
+          run: |
+              sudo apt update
+              sudo apt install awscli -y
+              aws ssm send-command --instance-ids ${{ inputs.ec2-instance-id }} --document-name  StartGithubSelfHostedRunner --output text
+              aws ssm list-command-invocations