Merge branch 'master' into dependabot/npm_and_yarn/src/frontend/efiling-demo/semver-5.7.2

Author: jianmingtu

.github/workflows/code-climate-coverage-aggregation.yml

@@ -137,7 +137,7 @@ jobs:
 
       # Upload JSON for debugging purposes
       - name: Upload JSON for debugging purposes
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: summed-yarn-coverage-report
           path: coverage/total-codeclimate.json
@@ -156,7 +156,13 @@ jobs:
         with:
           repository: bcgov/spring-boot-starters
           path: spring-boot-starters
-          ref: v0.2.2
+          ref: v1.0.1
+          
+      # Setup Java Environment
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
 
       # TODO REMOVE AFTER SFTP IS IN MAVEN CENTRAL
       - name: Build Spring Starters
@@ -202,19 +208,20 @@ jobs:
           #echo "::set-env name=GIT_BRANCH::master"
         if: env.GIT_BRANCH == 'refs/heads/master'
 
-      # Setup Java Environment
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
       #- uses: actions/cache@v1
       #  with:
       #    path: ~/.m2/repository
       #    key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
       #    restore-keys: |
       #      ${{ runner.os }}-maven-
 
-      # Run Maven Verify to generate all jacoco reports
+      #Set env again??
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+
+     # Run Maven Verify to generate all jacoco reports        
       - name: Build with Maven
         run: mvn -B verify -P all --file src/backend/pom.xml
 
@@ -256,7 +263,7 @@ jobs:
 
       # Upload JSON for debugging purposes
       - name: Upload JSON for debugging purposes
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: summed-java-coverage-report
           path: coverage/total-codeclimate.json
@@ -311,35 +318,35 @@ jobs:
 
       # Download Spring-boot coverage report
       - name: Download spring-boot coverage report
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: summed-java-coverage-report
 
       # See what is inside
       - name: List items inside java coverage report object
         run: |
-          ls summed-java-coverage-report
+          ls
 
       # Copy total java to outside directory
       - name: Copy Java Coverage to directory
         run: |
-          cp summed-java-coverage-report/total-codeclimate.json coverage-reports/total-java-codeclimate.json
+          cp total-codeclimate.json coverage-reports/total-java-codeclimate.json
 
       # Download Yarn coverage report
       - name: Download javascript coverage report
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: summed-yarn-coverage-report
 
       # See what is inside
-      - name: List items inside java coverage report object
+      - name: List items inside javascript coverage report object
         run: |
-          ls summed-yarn-coverage-report
+          ls 
 
       # Copy total Yarn to outside directory
       - name: Copy Yarn Coverage to directory
         run: |
-          cp summed-yarn-coverage-report/total-codeclimate.json coverage-reports/total-yarn-codeclimate.json
+          cp total-codeclimate.json coverage-reports/total-yarn-codeclimate.json
 
       # See what is inside coverage
       - name: List items inside java coverage report object
@@ -352,7 +359,7 @@ jobs:
 
       # Upload JSON for debugging purposes
       - name: Upload JSON for debugging purposes
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: summed-total-coverage-report
           path: coverage-reports/total-codeclimate.json

.github/workflows/cucumber-tests.yml

@@ -33,7 +33,7 @@ jobs:
           -t efiling-api:builder
           --build-arg SERVICE_NAME=efiling-api
           --build-arg MVN_PROFILE=efiling-api-demo
-          --build-arg STARTERS_V=v0.2.2
+          --build-arg STARTERS_V=v1.0.1
           --cache-from=docker.pkg.github.com/$GITHUB_REPOSITORY/efiling-api:builder
 
       - name: tag & push efiling-api to git container registry
@@ -49,7 +49,7 @@ jobs:
           -t efiling-api:demo
           --build-arg SERVICE_NAME=efiling-api
           --build-arg MVN_PROFILE=efiling-api-demo
-          --build-arg STARTERS_V=v0.2.2
+          --build-arg STARTERS_V=v1.0.1
           --cache-from=docker.pkg.github.com/$GITHUB_REPOSITORY/efiling-api:builder
           --cache-from=docker.pkg.github.com/$GITHUB_REPOSITORY/efiling-api:demo
 
@@ -135,10 +135,10 @@ jobs:
 
       # pulling images is faster than caching in most of the case
       - name: pull available docker images first
-        run: docker-compose pull -q --parallel redis clamav keycloak 
+        run: docker compose pull -q --parallel redis clamav keycloak 
 
       - name: Standup Infra
-        run: docker-compose up -d redis clamav keycloak 
+        run: docker compose up -d redis clamav keycloak 
 
       - name: Login to Docker Hub
         uses: docker/login-action@v1
@@ -157,26 +157,26 @@ jobs:
 
       - name: Pull images (Local REPO only)
         if: github.event.pull_request.head.repo.full_name == github.repository
-        run: docker-compose -f docker-compose.yml  -f tests/docker-compose-integration.yml pull --parallel -q efiling-api efiling-frontend keycloak-config
+        run: docker compose -f docker-compose.yml  -f tests/docker-compose-integration.yml pull --parallel -q efiling-api efiling-frontend keycloak-config
 
       - name: Standup Docker Pods (Local REPO only)
         if: github.event.pull_request.head.repo.full_name == github.repository
-        run: docker-compose -f docker-compose.yml  -f tests/docker-compose-integration.yml up -d efiling-api efiling-frontend
+        run: docker compose -f docker-compose.yml  -f tests/docker-compose-integration.yml up -d efiling-api efiling-frontend
 
 
       - name: Standup Docker Pods (FORK only)
         if: github.event.pull_request.head.repo.full_name != github.repository
-        run: docker-compose up -d efiling-api efiling-frontend
+        run: docker compose up -d efiling-api efiling-frontend
 
       - name: Configure keycloak (Local REPO only)
         if: github.event.pull_request.head.repo.full_name == github.repository
         run: |
-          docker-compose -f docker-compose.yml  -f tests/docker-compose-integration.yml up keycloak-config
+          docker compose -f docker-compose.yml  -f tests/docker-compose-integration.yml up keycloak-config
 
       - name: Configure keycloak (FORK only)
         if: github.event.pull_request.head.repo.full_name != github.repository
         run: |
-          docker-compose up keycloak-config
+          docker compose up keycloak-config
 
       - name: Running Integration Tests
         env:
@@ -198,14 +198,14 @@ jobs:
 
       # Upload Spark report for debugging purposes
       - name: Upload Spark report for debugging purposes
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: cucumber-spark-report
           path: ./tests/test-output/extent/Spark/Index.html
 
       # Upload Cucumber JSON for debugging purposes
       - name: Upload Cucumber JSON for debugging purposes
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: cucumber-json-report
           path: ./tests/target/cucumber-reports/CucumberTestReport.json

.github/workflows/dev-efiling-admin-build-4.yml

@@ -0,0 +1,84 @@
+name: Build Efiling Admin Docker Image and Push to Openshift Image Registry
+
+on:
+  schedule:
+    - cron: "0 0 * */3 *"
+  push:
+    branches: [master]
+    paths:
+      - "src/frontend/efiling-demo/**"
+      - ".github/workflows/dev-efiling-admin-build.yaml"
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Login to Artifactory
+        uses: docker/login-action@v1
+        with:
+          registry: artifacts.developer.gov.bc.ca
+          username: ${{ secrets.EFILING_ARTIFACTORY_USERNAME }}
+          password: ${{ secrets.EFILING_ARTIFACTORY_PASSWORD }}
+      
+      - name: Build Image
+        run: |
+          docker compose build efiling-demo
+          docker tag jag-file-submission-efiling-demo artifacts.developer.gov.bc.ca/efc7-efiling-admin/efiling-admin:dev
+      
+      - name: Docker Push to Artifactory
+        run: |
+          docker push artifacts.developer.gov.bc.ca/efc7-efiling-admin/efiling-admin:dev
+      
+      # Get SHORT_SHA for the version
+      - name: Get short SHA
+        id: short_sha
+        run: |
+          echo "::set-output name=SHORT_SHA::$(git rev-parse --short HEAD)"
+          echo "Short SHA: $SHORT_SHA"
+
+      - name: Checkout ArgoCD Repo
+        id: gitops
+        uses: actions/checkout@v4
+        with:
+          repository: bcgov-c/tenant-gitops-fc726a
+          ref: develop
+          token: ${{ secrets.ARGO_PAT }} # `ARGO_PAT` is a secret that contains your PAT
+          path: gitops
+
+      - name: Update Helm Values and Commit
+        id: helm
+        if: steps.gitops.outcome == 'success'  # Only run if the previous step (publish) was successful
+        run: |
+          # Clone the GitOps deployment configuration repository
+          # Navigate to the directory containing your Helm values file for the environment develop -> DEV, test -> test and 
+          cd gitops/charts
+
+          # Update the Helm values file with the new image tag and version
+          DATETIME=$(date +'%Y-%m-%d %H:%M:%S')  # Get current date and time
+
+          sed -i "s/admintag: .*/admintag: dev # Image Updated on $DATETIME/" ../deploy/dev_values.yaml
+          sed -i "s/adminVersion: .*/adminVersion: ${{ steps.short_sha.outputs.SHORT_SHA }} # Version Updated on $DATETIME/" ../deploy/dev_values.yaml
+          
+          # Commit and push the changes
+          git config --global user.email "[email protected]"
+          git config --global user.name "GitHub Actions"
+          
+          git add .
+          
+          git add ../deploy/dev_values.yaml
+          
+          # Repackage Helm Chart      
+
+          cd efiling-gitops
+
+          helm dependency build
+          
+          cd charts
+
+          git add .
+          
+          git commit -m "Update Dev Admin image tag"
+          git push origin develop  # Update the branch name as needed