Merge branch 'main' into bugfix/queue-deduplication-id-test

CrowdDotDev · Sep 19, 2023 · f730ad5 · f730ad5
2 parents 1082700 + 8ce1b35
commit f730ad5
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 26 deletions.
diff --git a/.github/workflows/build-script-executor.yaml b/.github/workflows/build-script-executor.yaml
diff --git a/.github/workflows/lf-production-deploy-new.yaml b/.github/workflows/lf-production-deploy-new.yaml
@@ -15,6 +15,10 @@ on:
         description: Deploy webhook-api service?
         required: true
         type: boolean
+      deploy_script_executor:
+        description: Deploy script-executor service?
+        required: true
+        type: boolean
 
 env:
   DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -91,6 +95,27 @@ jobs:
         id: image
         run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
 
+  build-and-push-script-executor:
+    runs-on: ubuntu-latest
+    if: ${{ inputs.deploy_script_executor }}
+    outputs:
+      image: ${{ steps.image.outputs.IMAGE }}
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/build-docker-image
+        id: image-builder
+        with:
+          image: script-executor
+
+      - name: Set docker image output
+        id: image
+        run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
+
   deploy-search-sync-worker:
     needs: build-and-push-search-sync-worker
     runs-on: ubuntu-latest
@@ -144,3 +169,21 @@ jobs:
           service: webhook-api
           image: ${{ needs.build-and-push-webhook-api.outputs.image }}
           cluster: ${{ env.CROWD_CLUSTER }}
+
+  deploy-script-executor:
+    needs: build-and-push-script-executor
+    runs-on: ubuntu-latest
+    if: ${{ inputs.deploy_script_executor }}
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/deploy-service
+        with:
+          service: script-executor
+          image: ${{ needs.build-and-push-script-executor.outputs.image }}
+          cluster: ${{ env.CROWD_CLUSTER }}
diff --git a/.github/workflows/production-deploy-new.yaml b/.github/workflows/production-deploy-new.yaml
@@ -15,6 +15,10 @@ on:
         description: Deploy webhook-api service?
         required: true
         type: boolean
+      deploy_script_executor:
+        description: Deploy script-executor service?
+        required: true
+        type: boolean
 
 env:
   DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -91,6 +95,27 @@ jobs:
         id: image
         run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
 
+  build-and-push-script-executor:
+    runs-on: ubuntu-latest
+    if: ${{ inputs.deploy_script_executor }}
+    outputs:
+      image: ${{ steps.image.outputs.IMAGE }}
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/build-docker-image
+        id: image-builder
+        with:
+          image: script-executor
+
+      - name: Set docker image output
+        id: image
+        run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
+
   deploy-search-sync-worker:
     needs: build-and-push-search-sync-worker
     runs-on: ubuntu-latest
@@ -144,3 +169,21 @@ jobs:
           service: webhook-api
           image: ${{ needs.build-and-push-webhook-api.outputs.image }}
           cluster: ${{ env.CROWD_CLUSTER }}
+
+  deploy-script-executor:
+    needs: build-and-push-script-executor
+    runs-on: ubuntu-latest
+    if: ${{ inputs.deploy_script_executor }}
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/deploy-service
+        with:
+          service: script-executor
+          image: ${{ needs.build-and-push-script-executor.outputs.image }}
+          cluster: ${{ env.CROWD_CLUSTER }}