Use workflow_dispatch for all images

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
devfile · Mar 14, 2024 · 2b3945a · 2b3945a
1 parent 48e4a1a
commit 2b3945a
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 49 deletions.
diff --git a/.github/workflows/alpine-vscode-startup.yaml b/.github/workflows/alpine-vscode-startup.yaml
@@ -1,25 +1,31 @@
 name: alpine-vscode-startup
 
 on:
-  workflow_run:
-    workflows: [alpine-build]
-    branches: [main]
-    types:
-      - completed
+  workflow_dispatch:
+    inputs:
+      sandboxToken:
+        description: "Red Hat Developer Sandbox Token"
+        required: true
+        type: string
 
 env:
   CLOUD_DEV_IMAGE: quay.io/mloriedo/cloud-dev-images:alpine
   EDITOR_IMAGE: quay.io/che-incubator/che-code:insiders
   CLUSTER_URL: https://api.sandbox-m2.ll9k.p1.openshiftapps.com:6443
-  CLUSTER_TOKEN: ${{ secrets.DEV_SANDBOX_TOKEN }}
 
 jobs:
   vscode-startup:
     runs-on: ubuntu-latest
     steps:
+      - name: Mask Sandbox Token # https://github.com/actions/runner/issues/643
+        id: mask-sandbox-token
+        run: |
+          token=$(jq -r '.inputs.sandboxToken' $GITHUB_EVENT_PATH)
+          echo "::add-mask::$token"
+          echo "cluster-token=$token" >> "$GITHUB_OUTPUT"
       - name: Checkout
         uses: actions/checkout@v4
       - name: Login to Dev Sandbox
-        run: oc login --token=${{ env.CLUSTER_TOKEN }} --server=${{ env.CLUSTER_URL }}
+        run: oc login --token=${{ steps.mask-sandbox-token.outputs.cluster-token }} --server=${{ env.CLUSTER_URL }}
       - name: Run Test
         run: ${PWD}/__tests__/test-editor-startup-in-image.sh
diff --git a/.github/workflows/busybox-vscode-startup.yaml b/.github/workflows/busybox-vscode-startup.yaml
@@ -1,25 +1,31 @@
 name: busybox-vscode-startup
 
 on:
-  workflow_run:
-    workflows: [busybox-build]
-    branches: [main]
-    types:
-      - completed
+  workflow_dispatch:
+    inputs:
+      sandboxToken:
+        description: "Red Hat Developer Sandbox Token"
+        required: true
+        type: string
 
 env:
   CLOUD_DEV_IMAGE: quay.io/mloriedo/cloud-dev-images:busybox
   EDITOR_IMAGE: quay.io/che-incubator/che-code:insiders
   CLUSTER_URL: https://api.sandbox-m2.ll9k.p1.openshiftapps.com:6443
-  CLUSTER_TOKEN: ${{ secrets.DEV_SANDBOX_TOKEN }}
 
 jobs:
   vscode-startup:
     runs-on: ubuntu-latest
     steps:
+      - name: Mask Sandbox Token # https://github.com/actions/runner/issues/643
+        id: mask-sandbox-token
+        run: |
+          token=$(jq -r '.inputs.sandboxToken' $GITHUB_EVENT_PATH)
+          echo "::add-mask::$token"
+          echo "cluster-token=$token" >> "$GITHUB_OUTPUT"
       - name: Checkout
         uses: actions/checkout@v4
       - name: Login to Dev Sandbox
-        run: oc login --token=${{ env.CLUSTER_TOKEN }} --server=${{ env.CLUSTER_URL }}
+        run: oc login --token=${{ steps.mask-sandbox-token.outputs.cluster-token }} --server=${{ env.CLUSTER_URL }}
       - name: Run Test
         run: ${PWD}/__tests__/test-editor-startup-in-image.sh
diff --git a/.github/workflows/fedora-vscode-startup.yaml b/.github/workflows/fedora-vscode-startup.yaml
@@ -1,25 +1,31 @@
 name: fedora-vscode-startup
 
 on:
-  workflow_run:
-    workflows: [fedora-build]
-    branches: [main]
-    types:
-      - completed
+  workflow_dispatch:
+    inputs:
+      sandboxToken:
+        description: "Red Hat Developer Sandbox Token"
+        required: true
+        type: string
 
 env:
   CLOUD_DEV_IMAGE: quay.io/mloriedo/cloud-dev-images:fedora
   EDITOR_IMAGE: quay.io/che-incubator/che-code:insiders
   CLUSTER_URL: https://api.sandbox-m2.ll9k.p1.openshiftapps.com:6443
-  CLUSTER_TOKEN: ${{ secrets.DEV_SANDBOX_TOKEN }}
 
 jobs:
   vscode-startup:
     runs-on: ubuntu-latest
     steps:
+      - name: Mask Sandbox Token # https://github.com/actions/runner/issues/643
+        id: mask-sandbox-token
+        run: |
+          token=$(jq -r '.inputs.sandboxToken' $GITHUB_EVENT_PATH)
+          echo "::add-mask::$token"
+          echo "cluster-token=$token" >> "$GITHUB_OUTPUT"
       - name: Checkout
         uses: actions/checkout@v4
       - name: Login to Dev Sandbox
-        run: oc login --token=${{ env.CLUSTER_TOKEN }} --server=${{ env.CLUSTER_URL }}
+        run: oc login --token=${{ steps.mask-sandbox-token.outputs.cluster-token }} --server=${{ env.CLUSTER_URL }}
       - name: Run Test
         run: ${PWD}/__tests__/test-editor-startup-in-image.sh
diff --git a/.github/workflows/golang-vscode-startup.yaml b/.github/workflows/golang-vscode-startup.yaml
@@ -17,7 +17,7 @@ jobs:
   vscode-startup:
     runs-on: ubuntu-latest
     steps:
-      - name: Mask Sandbox Token
+      - name: Mask Sandbox Token # https://github.com/actions/runner/issues/643
         id: mask-sandbox-token
         run: |
           token=$(jq -r '.inputs.sandboxToken' $GITHUB_EVENT_PATH)

diff --git a/.github/workflows/openjdk-vscode-startup.yaml b/.github/workflows/openjdk-vscode-startup.yaml
@@ -1,25 +1,31 @@
 name: openjdk-vscode-startup
 
 on:
-  workflow_run:
-    workflows: [openjdk-build]
-    branches: [main]
-    types:
-      - completed
+  workflow_dispatch:
+    inputs:
+      sandboxToken:
+        description: "Red Hat Developer Sandbox Token"
+        required: true
+        type: string
 
 env:
   CLOUD_DEV_IMAGE: quay.io/mloriedo/cloud-dev-images:openjdk
   EDITOR_IMAGE: quay.io/che-incubator/che-code:insiders
   CLUSTER_URL: https://api.sandbox-m2.ll9k.p1.openshiftapps.com:6443
-  CLUSTER_TOKEN: ${{ secrets.DEV_SANDBOX_TOKEN }}
 
 jobs:
   vscode-startup:
     runs-on: ubuntu-latest
     steps:
+      - name: Mask Sandbox Token # https://github.com/actions/runner/issues/643
+        id: mask-sandbox-token
+        run: |
+          token=$(jq -r '.inputs.sandboxToken' $GITHUB_EVENT_PATH)
+          echo "::add-mask::$token"
+          echo "cluster-token=$token" >> "$GITHUB_OUTPUT"
       - name: Checkout
         uses: actions/checkout@v4
       - name: Login to Dev Sandbox
-        run: oc login --token=${{ env.CLUSTER_TOKEN }} --server=${{ env.CLUSTER_URL }}
+        run: oc login --token=${{ steps.mask-sandbox-token.outputs.cluster-token }} --server=${{ env.CLUSTER_URL }}
       - name: Run Test
         run: ${PWD}/__tests__/test-editor-startup-in-image.sh
diff --git a/.github/workflows/ubi8-vscode-startup.yaml b/.github/workflows/ubi8-vscode-startup.yaml
@@ -1,25 +1,31 @@
 name: ubi8-vscode-startup
 
 on:
-  workflow_run:
-    workflows: [ubi8-build]
-    branches: [main]
-    types:
-      - completed
+  workflow_dispatch:
+    inputs:
+      sandboxToken:
+        description: "Red Hat Developer Sandbox Token"
+        required: true
+        type: string
 
 env:
   CLOUD_DEV_IMAGE: quay.io/mloriedo/cloud-dev-images:ubi8
   EDITOR_IMAGE: quay.io/che-incubator/che-code:insiders
   CLUSTER_URL: https://api.sandbox-m2.ll9k.p1.openshiftapps.com:6443
-  CLUSTER_TOKEN: ${{ secrets.DEV_SANDBOX_TOKEN }}
 
 jobs:
   vscode-startup:
     runs-on: ubuntu-latest
     steps:
+      - name: Mask Sandbox Token # https://github.com/actions/runner/issues/643
+        id: mask-sandbox-token
+        run: |
+          token=$(jq -r '.inputs.sandboxToken' $GITHUB_EVENT_PATH)
+          echo "::add-mask::$token"
+          echo "cluster-token=$token" >> "$GITHUB_OUTPUT"
       - name: Checkout
         uses: actions/checkout@v4
       - name: Login to Dev Sandbox
-        run: oc login --token=${{ env.CLUSTER_TOKEN }} --server=${{ env.CLUSTER_URL }}
+        run: oc login --token=${{ steps.mask-sandbox-token.outputs.cluster-token }} --server=${{ env.CLUSTER_URL }}
       - name: Run Test
         run: ${PWD}/__tests__/test-editor-startup-in-image.sh
diff --git a/.github/workflows/ubi9-vscode-startup.yaml b/.github/workflows/ubi9-vscode-startup.yaml
@@ -1,25 +1,31 @@
 name: ubi9-vscode-startup
 
 on:
-  workflow_run:
-    workflows: [ubi9-build]
-    branches: [main]
-    types:
-      - completed
+  workflow_dispatch:
+    inputs:
+      sandboxToken:
+        description: "Red Hat Developer Sandbox Token"
+        required: true
+        type: string
 
 env:
   CLOUD_DEV_IMAGE: quay.io/mloriedo/cloud-dev-images:ubi9
   EDITOR_IMAGE: quay.io/che-incubator/che-code:insiders
   CLUSTER_URL: https://api.sandbox-m2.ll9k.p1.openshiftapps.com:6443
-  CLUSTER_TOKEN: ${{ secrets.DEV_SANDBOX_TOKEN }}
 
 jobs:
   vscode-startup:
     runs-on: ubuntu-latest
     steps:
+      - name: Mask Sandbox Token # https://github.com/actions/runner/issues/643
+        id: mask-sandbox-token
+        run: |
+          token=$(jq -r '.inputs.sandboxToken' $GITHUB_EVENT_PATH)
+          echo "::add-mask::$token"
+          echo "cluster-token=$token" >> "$GITHUB_OUTPUT"
       - name: Checkout
         uses: actions/checkout@v4
       - name: Login to Dev Sandbox
-        run: oc login --token=${{ env.CLUSTER_TOKEN }} --server=${{ env.CLUSTER_URL }}
+        run: oc login --token=${{ steps.mask-sandbox-token.outputs.cluster-token }} --server=${{ env.CLUSTER_URL }}
       - name: Run Test
         run: ${PWD}/__tests__/test-editor-startup-in-image.sh
diff --git a/.github/workflows/ubuntu-vscode-startup.yaml b/.github/workflows/ubuntu-vscode-startup.yaml
@@ -1,11 +1,12 @@
 name: ubuntu-vscode-startup
 
 on:
-  workflow_run:
-    workflows: [ubuntu-build]
-    branches: [main]
-    types:
-      - completed
+  workflow_dispatch:
+    inputs:
+      sandboxToken:
+        description: "Red Hat Developer Sandbox Token"
+        required: true
+        type: string
 
 env:
   CLOUD_DEV_IMAGE: quay.io/mloriedo/cloud-dev-images:ubuntu
@@ -17,9 +18,15 @@ jobs:
   vscode-startup:
     runs-on: ubuntu-latest
     steps:
+      - name: Mask Sandbox Token # https://github.com/actions/runner/issues/643
+        id: mask-sandbox-token
+        run: |
+          token=$(jq -r '.inputs.sandboxToken' $GITHUB_EVENT_PATH)
+          echo "::add-mask::$token"
+          echo "cluster-token=$token" >> "$GITHUB_OUTPUT"
       - name: Checkout
         uses: actions/checkout@v4
       - name: Login to Dev Sandbox
-        run: oc login --token=${{ env.CLUSTER_TOKEN }} --server=${{ env.CLUSTER_URL }}
+        run: oc login --token=${{ steps.mask-sandbox-token.outputs.cluster-token }} --server=${{ env.CLUSTER_URL }}
       - name: Run Test
         run: ${PWD}/__tests__/test-editor-startup-in-image.sh