Merge pull request #77 from jadecarino/main

Iss2007 and Iss2085 - Recycle ecosystem1 after Web UI changes / Support forks in the workflows
galasa-dev · Dec 9, 2024 · 5cd6054 · 5cd6054
2 parents ae66b83 + 917f803
commit 5cd6054
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 24 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -12,12 +12,42 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  NAMESPACE: galasa-dev
+  NAMESPACE: ${{ github.repository_owner }}
+  BRANCH: ${{ github.ref_name }}
 
 jobs:
+  check-secrets:
+    # Run this job for forks
+    if: ${{ github.repository_owner != 'galasa-dev' }}
+    name: Check for required secrets
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check if WRITE_GITHUB_PACKAGES_USERNAME is set in this repository
+        run: |
+          if [ -z "${{ secrets.WRITE_GITHUB_PACKAGES_USERNAME }}" ]; then
+            echo "WRITE_GITHUB_PACKAGES_USERNAME is not set. Please configure it in the repository secrets. \
+            It must contain the GitHub username you want to use to log into GitHub Container Registry."
+            exit 1
+          else
+            echo "WRITE_GITHUB_PACKAGES_USERNAME is set."
+          fi
+
+      - name: Check if WRITE_GITHUB_PACKAGES_TOKEN is set in this repository
+        run: |
+          if [ -z "${{ secrets.WRITE_GITHUB_PACKAGES_TOKEN }}" ]; then
+            echo "WRITE_GITHUB_PACKAGES_TOKEN is not set. Please configure it in the repository secrets. \
+            It must contain a GitHub Personal Access Token with write:packages scope \
+            that you want to use to log into GitHub Container Registry.""
+            exit 1
+          else
+            echo "WRITE_GITHUB_PACKAGES_TOKEN is set."
+          fi
+
   build-webui:
     name: Build the Galasa Web UI
     runs-on: ubuntu-latest
+    needs: check-secrets
 
     steps:
       - name: Checkout Code
@@ -35,12 +65,12 @@ jobs:
           gradle-version: 8.9
           cache-disabled: true
 
-      - name: Generate typescript openapi client using gradle
+      - name: Generate typescript openapi client using Gradle
         run: |
           gradle generateTypeScriptClient --info \
           --no-daemon --console plain \
           -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr 2>&1 | tee build.log
-      
+
       - name: Upload Gradle build log
         if: failure()
         uses: actions/upload-artifact@v4
@@ -70,12 +100,12 @@ jobs:
         working-directory: ./galasa-ui
         run: |
           npm install
-      
+
       - name: Running webui's unit tests using npm
         working-directory: ./galasa-ui
         run: |
           npm test -- --watchAll=false
-      
+
       - name: Building webui using npm
         working-directory: ./galasa-ui
         run: |
@@ -85,15 +115,15 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: galasa-team
-          password: ${{ secrets.GALASA_TEAM_WRITE_PACKAGES_TOKEN }}
-  
+          username: ${{ secrets.WRITE_GITHUB_PACKAGES_USERNAME }}
+          password: ${{ secrets.WRITE_GITHUB_PACKAGES_TOKEN }}
+
       - name: Extract metadata for webui image
         id: metadata
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/webui
-  
+
       - name: Build Webui image
         id: build
         uses: docker/build-push-action@v5
@@ -104,14 +134,29 @@ jobs:
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
 
+  trigger-workflow:
+    # Skip this job for forks
+    if: ${{ github.repository_owner == 'galasa-dev' }}
+    name: Recycle ecosystem1
+    needs: build-webui
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Trigger Helm workflow using GitHub CLI
+        env:
+          GH_TOKEN: ${{ secrets.GALASA_TEAM_GITHUB_TOKEN }}
+        run: |
+          gh workflow run build-helm.yaml --repo https://github.com/galasa-dev/automation
+
   report-failure:
-    name: Report failure in workflow
+    # Skip this job for forks
+    if: ${{ failure() && github.repository_owner == 'galasa-dev' }}
+    name: Report workflow failure into Slack channel
     runs-on: ubuntu-latest
     needs: build-webui
-    if: failure()
 
     steps:
-      - name: Report failure in workflow to Slack
+      - name: Report workflow failure into Slack channel
         env: 
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
         run : |

diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
@@ -10,9 +10,24 @@ on:
     branches: [main]
 
 jobs:
+  detect-secrets:
+    name: Detect secrets in this Pull Request
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Turn script into an executable
+        run: chmod +x detect-secrets.sh
+
+      - name: Run the detect secrets script
+        run: ./detect-secrets.sh
+
   build-webui:
     name: Build the Galasa Web UI
     runs-on: ubuntu-latest
+    needs: detect-secrets
 
     steps:
       - name: Checkout Code
@@ -30,21 +45,21 @@ jobs:
           gradle-version: 8.9
           cache-disabled: true
 
-      - name: Generate typescript openapi client using gradle
+      - name: Generate typescript openapi client using Gradle
         run: |
           set -o pipefail
           gradle generateTypeScriptClient --info \
           --no-daemon --console plain \
           -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr 2>&1 | tee build.log
-      
+
       - name: Upload Gradle build log
         if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: gradle-build-log
           path: build.log
           retention-days: 7
-          
+
       - name: Fix openapi client
         run: |
           mkdir -p temp &&
@@ -61,28 +76,22 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: "20.10.0"
-
-      - name: Turn script into an executable
-        run: chmod +x detect-secrets.sh
-
-      - name: Run the detect secrets script
-        run: ./detect-secrets.sh
 
       - name: Installing webui's dependencies using npm
         working-directory: ./galasa-ui
         run: |
           npm install
-      
+
       - name: Running webui's unit tests using npm
         working-directory: ./galasa-ui
         run: |
           npm test -- --watchAll=false
-      
+
       - name: Building webui using npm
         working-directory: ./galasa-ui
         run: |
           npm run build
-      
+
       - name: Build Webui image for testing
         id: build
         uses: docker/build-push-action@v5