feat: update backstage file and workflows (#11)

bcgov · Jan 22, 2025 · 8c98207 · 8c98207
1 parent c802f3d
commit 8c98207
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/build-intention.json b/.github/workflows/build-intention.json
@@ -15,11 +15,13 @@
         "environment": "tools"
       },
       "package": {
+        "architecture": "jvm",
         "version": "",
         "buildVersion": "",
         "buildNumber": 0,
         "name": "java-maven-pipeline-example",
-        "type": "war"
+        "type": "war",
+        "license": "Apache-2.0"
       }
     }
   ],

diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
@@ -92,7 +92,7 @@ jobs:
           broker_jwt: ${{ secrets.broker_jwt_0e727e83_f027_426a_a31c_d7c1cceaddf6 }}
           intention_path: intention.json
           quickstart: true
-      - name: Set intention ID for deployment job
+      - name: Echo intention ID for deploy job
         id: set-intention-id
         run: |
           echo "intention_id=${INTENTION_ID}" >> $GITHUB_OUTPUT
@@ -119,6 +119,13 @@ jobs:
           ARTIFACT_SHA256: ${{ steps.publish-artifact.outputs.artifact_sha256 }}
           BUILD_TOKEN: ${{ env.ACTION_TOKEN_BUILD }}
       - name: Close intention
-        uses: bcgov-nr/action-broker-intention-close@v1
+        if: ${{ success() && env.INTENTION_TOKEN != '' }}
+        uses: bcgov-nr/action-broker-intention-close@v3
         with:
           intention_token: ${{ env.INTENTION_TOKEN }}
+      - name: Close intention (Failure)
+        if: ${{ failure() && env.INTENTION_TOKEN != '' }}
+        uses: bcgov-nr/action-broker-intention-close@v3
+        with:
+          intention_token: ${{ env.INTENTION_TOKEN }}
+          outcome: failure
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -177,6 +177,7 @@ jobs:
           curl \
           --data-urlencode "token=${{ secrets.JENKINS_TOKEN }}" \
           --data-urlencode "githubToken=${{ secrets.GITHUB_TOKEN }}" \
+          --data-urlencode "brokerJwt=${{ secrets.broker_jwt_0e727e83_f027_426a_a31c_d7c1cceaddf6 }}" \
           --data-urlencode "artifactSha256=${ARTIFACT_SHA256}" \
           --data-urlencode "projectVersion=${PROJECT_VERSION}" \
           --data-urlencode "gitBranch=${{ github.ref_name }}" \

diff --git a/app-config.yaml → catalog-info.yaml b/app-config.yaml → catalog-info.yaml
@@ -1,12 +1,12 @@
 spec:
   system: oneteam-example
-  type: ""
-  lifecycle: ""
-  owner: ""
+  type: "website"
+  lifecycle: "experimental"
+  owner: "Oscar"
 metadata:
   name: java-maven-pipeline-example
-  description: ""
-  title: ""
+  description: "Pipeline testing example for Java + Maven + Tomcat application"
+  title: "ONETEAM-EXAMPLE"
   annotations:
     playbook.io.nrs.gov.bc.ca/pomRoot: ./
     playbook.io.nrs.gov.bc.ca/unitTestsPath: ""
@@ -20,5 +20,8 @@ metadata:
     playbook.io.nrs.gov.bc.ca/useAltAppDirName: false
     playbook.io.nrs.gov.bc.ca/altAppDirName: ""
     playbook.io.nrs.gov.bc.ca/addWebadeConfig: false
-    github.com/project-slug: ""
+    github.com/project-slug: "bcgov/java-maven-pipeline-example"
     playbook.io.nrs.gov.bc.ca/clientId: 0e727e83-f027-426a-a31c-d7c1cceaddf6
+    license: Apache-2.0
+apiVersion: backstage.io/v1alpha1
+kind: Component