Merge pull request #3 from cyber-dojo/add-ci-env-vars

Add env-vars in ci pipelines
cyber-dojo · Mar 4, 2024 · 4071994 · 4071994
2 parents 09e7b47 + 3c08b23
commit 4071994
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 23 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,9 +10,10 @@ env:
   KOSLI_HOST: ${{ vars.KOSLI_HOST }}                 # https://app.kosli.com
   KOSLI_HOST_STAGING: ${{ vars.KOSLI_HOST_STAGING }} # https://staging.app.kosli.com
   KOSLI_ORG: ${{ vars.KOSLI_ORG }}                   # cyber-dojo
-  KOSLI_FLOW: runner-ci
+  KOSLI_FLOW: ${{ vars.KOSLI_FLOW  }}                # runner-ci
   KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
   KOSLI_TRAIL: ${{ github.sha }}
+  SERVICE_NAME: ${{ github.event.repository.name }}  # runner
 
 jobs:
 
@@ -44,7 +45,7 @@ jobs:
         run: |
           IMAGE_TAG=${GITHUB_SHA:0:7}
           echo "image_tag=${IMAGE_TAG}" >> ${GITHUB_OUTPUT}       
-          echo "image_name=cyberdojo/runner:${IMAGE_TAG}" >> ${GITHUB_OUTPUT}          
+          echo "image_name=cyberdojo/${{ env.SERVICE_NAME }}:${IMAGE_TAG}" >> ${GITHUB_OUTPUT}          
 
 
   pull-request:
@@ -307,7 +308,7 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: staging
-      url: ${{ vars.KOSLI_HOST_STAGING }}
+      url: https://beta.cyber-dojo.org
     env:
       IMAGE_NAME:        ${{ needs.kosli-trail.outputs.image_name }}
       KOSLI_FINGERPRINT: ${{ needs.build-image.outputs.kosli_fingerprint }}
@@ -343,7 +344,7 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: production
-      url: ${{ vars.KOSLI_HOST }}
+      url: https://beta.cyber-dojo.org
     env:
       IMAGE_NAME:        ${{ needs.kosli-trail.outputs.image_name }}
       KOSLI_FINGERPRINT: ${{ needs.build-image.outputs.kosli_fingerprint }}

diff --git a/.github/workflows/main_staging.yml b/.github/workflows/main_staging.yml
@@ -6,12 +6,13 @@ on:
       - main
 
 env:
-  KOSLI_DRY_RUN: ${{ vars.KOSLI_DRY_RUN }}   # False
-  KOSLI_HOST: ${{ vars.KOSLI_HOST_STAGING }} # https://staging.app.kosli.com
-  KOSLI_ORG: ${{ vars.KOSLI_ORG }}           # cyber-dojo
-  KOSLI_FLOW: runner-ci
+  KOSLI_DRY_RUN: ${{ vars.KOSLI_DRY_RUN }}           # False
+  KOSLI_HOST: ${{ vars.KOSLI_HOST_STAGING }}         # https://staging.app.kosli.com
+  KOSLI_ORG: ${{ vars.KOSLI_ORG }}                   # cyber-dojo
+  KOSLI_FLOW: ${{ vars.KOSLI_FLOW  }}                # runner-ci
   KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN_STAGING }}
   KOSLI_TRAIL: ${{ github.sha }}
+  SERVICE_NAME: ${{ github.event.repository.name }}  # runner
 
 jobs:
 
@@ -43,7 +44,7 @@ jobs:
         run: |
           IMAGE_TAG=${GITHUB_SHA:0:7}
           echo "image_tag=${IMAGE_TAG}" >> ${GITHUB_OUTPUT}
-          echo "image_name=cyberdojo/runner:${IMAGE_TAG}" >> ${GITHUB_OUTPUT}
+          echo "image_name=cyberdojo/${{ env.SERVICE_NAME }}:${IMAGE_TAG}" >> ${GITHUB_OUTPUT}
 
 
   pull-request:
@@ -407,5 +408,5 @@ jobs:
       - name: Tag image to :latest and push to Dockerhub Registry
         run: |
           docker pull "${IMAGE_NAME}"
-          docker tag "${IMAGE_NAME}" cyberdojo/runner:latest
-          docker push cyberdojo/runner:latest
+          docker tag "${IMAGE_NAME}" cyberdojo/${{ env.SERVICE_NAME }}:latest
+          docker push cyberdojo/${{ env.SERVICE_NAME }}:latest
diff --git a/.github/workflows/sub_deploy_to_beta.yml b/.github/workflows/sub_deploy_to_beta.yml
@@ -14,12 +14,13 @@ on:
 
 
 env:
-  KOSLI_ORG: cyber-dojo
-  KOSLI_FLOW: runner-ci
-  KOSLI_TRAIL: ${{ github.sha }}
+  KOSLI_DRY_RUN: ${{ vars.KOSLI_DRY_RUN }}           # False
   KOSLI_HOST: "https://app.kosli.com"
   KOSLI_HOST_STAGING: "https://staging.app.kosli.com"
-
+  KOSLI_ORG: ${{ vars.KOSLI_ORG }}                   # cyber-dojo
+  KOSLI_FLOW: ${{ vars.KOSLI_FLOW  }}                # runner-ci
+  KOSLI_TRAIL: ${{ github.sha }}
+  SERVICE_NAME: ${{ github.event.repository.name }}  # runner
 
 jobs:
 
@@ -36,7 +37,7 @@ jobs:
     - name: Prepare outputs for fivexl deployment workflow
       id: vars
       run: |
-        echo "service_name=runner"                                          >> ${GITHUB_OUTPUT}
+        echo "service_name=${{ env.SERVICE_NAME }}"                         >> ${GITHUB_OUTPUT}
         echo "image_tag=${{ inputs.IMAGE_TAG }}"                            >> ${GITHUB_OUTPUT}
         echo "aws_account_id=244531986313"                                  >> ${GITHUB_OUTPUT}
         echo "ecr_registry=244531986313.dkr.ecr.eu-central-1.amazonaws.com" >> ${GITHUB_OUTPUT}

diff --git a/.github/workflows/sub_deploy_to_prod.yml b/.github/workflows/sub_deploy_to_prod.yml
@@ -14,11 +14,13 @@ on:
 
 
 env:
-  KOSLI_ORG: cyber-dojo
-  KOSLI_FLOW: runner-ci
-  KOSLI_TRAIL: ${{ github.sha }}
+  KOSLI_DRY_RUN: ${{ vars.KOSLI_DRY_RUN }}           # False
   KOSLI_HOST: "https://app.kosli.com"
   KOSLI_HOST_STAGING: "https://staging.app.kosli.com"
+  KOSLI_ORG: ${{ vars.KOSLI_ORG }}                   # cyber-dojo
+  KOSLI_FLOW: ${{ vars.KOSLI_FLOW  }}                # runner-ci
+  KOSLI_TRAIL: ${{ github.sha }}
+  SERVICE_NAME: ${{ github.event.repository.name }}  # runner
 
 jobs:
 
@@ -35,7 +37,7 @@ jobs:
     - name: Prepare outputs for fivexl deployment workflow
       id: vars
       run: |
-        echo "service_name=runner"                                          >> ${GITHUB_OUTPUT}        
+        echo "service_name=${{ env.SERVICE_NAME }}"                         >> ${GITHUB_OUTPUT}        
         echo "image_tag=${{ inputs.IMAGE_TAG }}"                            >> ${GITHUB_OUTPUT}
         echo "aws_account_id=274425519734"                                  >> ${GITHUB_OUTPUT}
         echo "ecr_registry=274425519734.dkr.ecr.eu-central-1.amazonaws.com" >> ${GITHUB_OUTPUT}

diff --git a/sh/wait_for_deployment.sh b/sh/wait_for_deployment.sh
@@ -54,9 +54,9 @@ image_not_deployed()
 docker pull "${IMAGE_NAME}"
 FINGERPRINT=$(kosli fingerprint "${IMAGE_NAME}" --artifact-type=docker)
 
-MAX_WAIT_TIME=$((8 * 60))  # max time to wait for image to be deployed
-SLEEP_TIME=15              # wait time between deployment checks
-MAX_ATTEMPTS=$(( MAX_WAIT_TIME / SLEEP_TIME ))
+MAX_WAIT_TIME=15 # max time to wait for image to be deployed, in minutes
+SLEEP_TIME=20    # wait time between deployment checks, in seconds
+MAX_ATTEMPTS=$(( MAX_WAIT_TIME * 60 / SLEEP_TIME ))
 ATTEMPTS=1
 
 until image_deployed