diff --git a/.github/workflows/build-intention.json b/.github/workflows/build-intention.json index 557ba1a..4be0f8b 100644 --- a/.github/workflows/build-intention.json +++ b/.github/workflows/build-intention.json @@ -10,15 +10,15 @@ "id": "build", "provision": [], "service": { - "project": "hello", - "name": "vvsddsv", + "project": "nodejs-sample", + "name": "nodejs-sample", "environment": "tools" }, "package": { "version": "", "buildVersion": "", "buildNumber": 0, - "name": "vvsddsv", + "name": "nodejs-sample", "type": "application/vnd.oci.image.layer.v1.tar" } } diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index d68c3ba..60514bb 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -15,15 +15,15 @@ concurrency: env: BROKER_URL: https://broker.io.nrs.gov.bc.ca - BROKER_JWT: ${{ secrets.BROKER_JWT }} - SERVICE_PROJECT: hello - SERVICE_NAME: vvsddsv + BROKER_JWT: ${{ secrets.broker_jwt_BFB8F8BC_D617_484A_9A4E_E9B98AB4E5BC }} + SERVICE_PROJECT: nodejs-sample + SERVICE_NAME: nodejs-sample jobs: check_token_expiration: uses: ./.github/workflows/check-token.yaml secrets: - token: ${{ secrets.BROKER_JWT }} + token: ${{ secrets.broker_jwt_BFB8F8BC_D617_484A_9A4E_E9B98AB4E5BC }} build-release: name: Build and release runs-on: ubuntu-latest @@ -78,7 +78,7 @@ jobs: - name: Open intention uses: bcgov-nr/action-broker-intention-open@v2 with: - broker_jwt: ${{ secrets.BROKER_JWT }} + broker_jwt: ${{ secrets.broker_jwt_BFB8F8BC_D617_484A_9A4E_E9B98AB4E5BC }} intention_path: intention.json quickstart: true - name: Set intention ID for deployment job diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 2ea0cce..efd9529 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -13,9 +13,9 @@ concurrency: cancel-in-progress: true env: - SERVICE_PROJECT: hello - SERVICE_NAME: vvsddsv - JOB: buildByToken/buildWithParameters?job=hello/vvsddsv + SERVICE_PROJECT: nodejs-sample + SERVICE_NAME: nodejs-sample + JOB: buildByToken/buildWithParameters?job=nodejs-sample/nodejs-sample URL: https://cd.io.nrs.gov.bc.ca PACKAGE_REPO: https://maven.pkg.github.com/ @@ -23,7 +23,7 @@ jobs: check_token_expiration: uses: ./.github/workflows/check-token.yaml secrets: - token: ${{ secrets.BROKER_JWT }} + token: ${{ secrets.broker_jwt_BFB8F8BC_D617_484A_9A4E_E9B98AB4E5BC }} deploy-build: name: Deploy development version if: ${{ ! startsWith(github.ref, 'refs/tags/') }} @@ -60,7 +60,7 @@ jobs: echo "artifact_sha256=${artifact_checksum#sha256:}" >> $GITHUB_OUTPUT env: BROKER_URL: https://broker.io.nrs.gov.bc.ca - BROKER_JWT: ${{ secrets.BROKER_JWT }} + BROKER_JWT: ${{ secrets.broker_jwt_BFB8F8BC_D617_484A_9A4E_E9B98AB4E5BC }} SERVICE_PROJECT: ${{ env.SERVICE_PROJECT }} SERVICE_NAME: ${{ env.SERVICE_NAME }} GITHUB_SHA: ${{ github.sha }} @@ -80,9 +80,9 @@ jobs: id: set-download-url run: | sudo apt-get -qq install libxml2-utils - GROUP_ID=$(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file ./pom.xml) + GROUP_ID=$(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file pom.xml) GROUP_ID_PATH="${GROUP_ID//.//}" - PACKAGE_TYPE=$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file ./pom.xml) + PACKAGE_TYPE=$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file pom.xml) curl -LO "${PACKAGE_REPO}/${GROUP_ID_PATH}/${SERVICE_NAME}/${PROJECT_VERSION}/maven-metadata.xml" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" TIMESTAMP=$(xmllint --xpath '//metadata/versioning/snapshot/timestamp/text()' maven-metadata.xml) BUILD_NUMBER=$(xmllint --xpath '//metadata/versioning/snapshot/buildNumber/text()' maven-metadata.xml) @@ -133,7 +133,7 @@ jobs: echo "artifact_sha256=${artifact_checksum#sha256:}" >> $GITHUB_OUTPUT env: BROKER_URL: https://broker.io.nrs.gov.bc.ca - BROKER_JWT: ${{ secrets.BROKER_JWT }} + BROKER_JWT: ${{ secrets.broker_jwt_BFB8F8BC_D617_484A_9A4E_E9B98AB4E5BC }} SERVICE_PROJECT: ${{ env.SERVICE_PROJECT }} SERVICE_NAME: ${{ env.SERVICE_NAME }} - name: Checkout repository @@ -152,9 +152,9 @@ jobs: id: set-download-url run: | sudo apt-get -qq install libxml2-utils - GROUP_ID=$(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file ./pom.xml) + GROUP_ID=$(mvn help:evaluate -Dexpression=project.groupId -q -DforceStdout --file pom.xml) GROUP_ID_PATH="${GROUP_ID//.//}" - PACKAGE_TYPE=$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file ./pom.xml) + PACKAGE_TYPE=$(mvn help:evaluate -Dexpression=project.packaging -q -DforceStdout --file pom.xml) ARTIFACT_NAME="${SERVICE_NAME}-${PROJECT_VERSION}.${PACKAGE_TYPE}" DOWNLOAD_URL="${PACKAGE_REPO}/${GROUP_ID_PATH}/${SERVICE_NAME}/${PROJECT_VERSION}/${ARTIFACT_NAME}" echo "${DOWNLOAD_URL}" diff --git a/.jenkins/deployment-intention.json b/.jenkins/deployment-intention.json index 3487985..8bef8a6 100644 --- a/.jenkins/deployment-intention.json +++ b/.jenkins/deployment-intention.json @@ -10,8 +10,8 @@ "id": "login", "provision": ["token/self"], "service": { - "name": "vvsddsv", - "project": "hello", + "name": "nodejs-sample", + "project": "nodejs-sample", "environment": "", "target": { "name": "jenkins-apps", @@ -25,8 +25,8 @@ "id": "configure", "provision": ["token/self"], "service": { - "name": "vvsddsv", - "project": "hello", + "name": "nodejs-sample", + "project": "nodejs-sample", "environment": "" } }, @@ -40,8 +40,8 @@ } }, "service": { - "name": "vvsddsv", - "project": "hello", + "name": "nodejs-sample", + "project": "nodejs-sample", "environment": "" }, "package": { diff --git a/app-config.yaml b/app-config.yaml index 57d6da7..0571a49 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -1,15 +1,14 @@ spec: - system: hello + system: "nodejs-sample" type: "" lifecycle: "" owner: "" metadata: - name: vvsddsv + name: "nodejs-sample" description: "" title: "" annotations: - playbook.io.nrs.gov.bc.ca/pomRoot: ./ - github.com/project-slug: "" + github.com/project-slug: "bcgov-nr/nodejs-sample" playbook.io.nrs.gov.bc.ca/unitTestsPath: "" playbook.io.nrs.gov.bc.ca/gitHubPackages: true playbook.io.nrs.gov.bc.ca/gitHubOwnerPack: "" @@ -19,6 +18,7 @@ metadata: playbook.io.nrs.gov.bc.ca/playbookPath: playbooks playbook.io.nrs.gov.bc.ca/tomcatContext: "" playbook.io.nrs.gov.bc.ca/useAltAppDirName: false - playbook.io.nrs.gov.bc.ca/altAppDirName: "" playbook.io.nrs.gov.bc.ca/addWebadeConfig: true - playbook.io.nrs.gov.bc.ca/clientId: " " + playbook.io.nrs.gov.bc.ca/clientId: "BFB8F8BC_D617_484A_9A4E_E9B98AB4E5BC" + playbook.io.nrs.gov.bc.ca/pomRoot: "" + playbook.io.nrs.gov.bc.ca/altAppDirName: "" diff --git a/playbooks/vars/standard/all.yaml b/playbooks/vars/standard/all.yaml index aa3f2f9..6b8fba1 100644 --- a/playbooks/vars/standard/all.yaml +++ b/playbooks/vars/standard/all.yaml @@ -7,8 +7,8 @@ ansible_become_password: "{{ lookup('ansible.builtin.env', 'PODMAN_CD_PASS') }}" ansible_ssh_extra_args: "-o StrictHostKeyChecking=no" # General properties -pd_prop_project_name: "HELLO" -pd_prop_service_name: "vvsddsv" +pd_prop_project_name: "NODEJS-SAMPLE" +pd_prop_service_name: "nodejs-sample" pd_prop_project_version: "{{ lookup('ansible.builtin.env', 'PODMAN_PROJECT_VERSION') }}" pd_prop_artifact_name: "{{ lookup('ansible.builtin.env', 'PODMAN_ARTIFACT_NAME') }}" pd_prop_artifact_sha256: "{{ lookup('ansible.builtin.env', 'PODMAN_ARTIFACT_SHA256') }}"