Merge pull request #985 from galasa-dev/iss1982

Iss1982 - Add copyright and remove argo app param
galasa-dev · Aug 30, 2024 · b2a7919 · b2a7919
2 parents a1ef630 + c1f8ccd
commit b2a7919
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -1,3 +1,8 @@
+#
+# Copyright contributors to the Galasa project
+#
+# SPDX-License-Identifier: EPL-2.0
+#
 name: Main build
 
 on:
@@ -26,7 +31,6 @@ env:
   REGISTRY: ghcr.io
   NAMESPACE: galasa-dev
   BRANCH: ${{ github.ref_name }}
-  ARGO_APP_BRANCH: gh # TODO: remove this parameter and just use env.BRANCH once we update development.galasa.dev/main with these workflows.
 
 jobs:
   log-github-ref:
@@ -71,10 +75,11 @@ jobs:
         run: |
           set -o pipefail
           gradle -b galasa-managers-parent/build.gradle check publish --info \
+          --no-daemon --console plain \
           -Dorg.gradle.jvmargs=-Xmx4096M \
-          -PsourceMaven=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/extensions \
+          -PsourceMaven=https://development.galasa.dev/${{ env.BRANCH }}/maven-repo/extensions \
           -PcentralMaven=https://repo.maven.apache.org/maven2/ \
-          -PtargetMaven=${{github.workspace}}/repo \
+          -PtargetMaven=${{ github.workspace }}/repo \
           -PjacocoEnabled=true \
           -PisMainOrRelease=true 2>&1 | tee build.log
 
@@ -89,10 +94,11 @@ jobs:
         run: |
           set -o pipefail
           gradle -b galasa-managers-parent/build.gradle check publish --info \
+          --no-daemon --console plain \
           -Dorg.gradle.jvmargs=-Xmx4096M \
-          -PsourceMaven=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/extensions \
+          -PsourceMaven=https://development.galasa.dev/${{ env.BRANCH }}/maven-repo/extensions \
           -PcentralMaven=https://repo.maven.apache.org/maven2/ \
-          -PtargetMaven=${{github.workspace}}/repo \
+          -PtargetMaven=${{ github.workspace }}/repo \
           -PjacocoEnabled=${{ inputs.jacocoEnabled }} \
           -PisMainOrRelease=${{ inputs.isMainOrRelease }} 2>&1 | tee build.log
         
@@ -109,7 +115,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: jacoco-report
-          path: ${{github.workspace}}/galasa-managers-parent/**/**/build/reports/**/*.html
+          path: ${{ github.workspace }}/galasa-managers-parent/**/**/build/reports/**/*.html
           retention-days: 7
           if-no-files-found: ignore
 
@@ -143,13 +149,13 @@ jobs:
         env: 
           ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
         run: |
-          docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run ${{ env.ARGO_APP_BRANCH }}-maven-repos restart --kind Deployment --resource-name managers-${{ env.ARGO_APP_BRANCH }} --server argocd.galasa.dev
+          docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run ${{ env.BRANCH }}-maven-repos restart --kind Deployment --resource-name managers-${{ env.BRANCH }} --server argocd.galasa.dev
 
       - name: Wait for app health in ArgoCD
         env: 
           ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
         run: |
-          docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app wait ${{ env.ARGO_APP_BRANCH }}-maven-repos --resource apps:Deployment:managers-${{ env.ARGO_APP_BRANCH }} --health --server argocd.galasa.dev
+          docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app wait ${{ env.BRANCH }}-maven-repos --resource apps:Deployment:managers-${{ env.BRANCH }} --health --server argocd.galasa.dev
 
   trigger-obr-workflow:
     name: Trigger OBR workflow

diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
@@ -1,3 +1,8 @@
+#
+# Copyright contributors to the Galasa project
+#
+# SPDX-License-Identifier: EPL-2.0
+#
 name: PR build
 
 on:
@@ -32,10 +37,11 @@ jobs:
         run: |
           set -o pipefail
           gradle -b galasa-managers-parent/build.gradle check publish --info \
+          --no-daemon --console plain \
           -Dorg.gradle.jvmargs=-Xmx4096M \
-          -PsourceMaven=https://development.galasa.dev/gh/maven-repo/extensions \
+          -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \
           -PcentralMaven=https://repo.maven.apache.org/maven2/ \
-          -PtargetMaven=${{github.workspace}}/repo 2>&1 | tee build.log
+          -PtargetMaven=${{ github.workspace }}/repo 2>&1 | tee build.log
 
       - name: Upload Gradle Build Log
         if: failure()
@@ -50,7 +56,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: jacoco-report
-          path: ${{github.workspace}}/galasa-managers-parent/**/**/build/reports/**/*.html
+          path: ${{ github.workspace }}/galasa-managers-parent/**/**/build/reports/**/*.html
           retention-days: 7
           if-no-files-found: ignore