feat: add approval to oras and quiet git output (#84)

* feat: add approval to oras and quiet git output

* feat: git output

* feat: add service name in front of intention file

Author: GraceRuan

pipelines/app-maven/Jenkinsfile

@@ -56,13 +56,13 @@ pipeline {
                         env.GITHUB_USER = "${params.githubUser}"
                         env.GITHUB_TOKEN = "${params.githubToken}"
                         wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [[var: env.GITHUB_TOKEN, password: GITHUB_TOKEN]]]) {
-                            sh 'git clone -q --branch ${GIT_BRANCH} https://${GITHUB_USER}:${GITHUB_TOKEN}@${GIT_REPO} app'
+                            sh 'git config --global advice.detachedHead false ; git clone -q --branch ${GIT_BRANCH} https://${GITHUB_USER}:${GITHUB_TOKEN}@${GIT_REPO} app'
                             if (DOWNLOAD_TYPE.toUpperCase().trim() == 'GITHUB') {
                                 sh 'cd downloads ; curl -LO "${DOWNLOAD_URL}" -H "Authorization: token ${GITHUB_TOKEN}"'
                             }
                         }
                     } else {
-                        sh 'git clone -q --branch ${GIT_BRANCH} https://${GIT_REPO} app'
+                        sh 'git config --global advice.detachedHead false ; git clone -q --branch ${GIT_BRANCH} https://${GIT_REPO} app'
                         if (DOWNLOAD_TYPE.toUpperCase().trim() == 'GITHUB') {
                             sh 'cd downloads ; curl -LO ${DOWNLOAD_URL}'
                         }

pipelines/app-oras/Jenkinsfile

@@ -125,7 +125,7 @@ pipeline {
                 GIT_CREDS_USR = GIT_CREDS_USR.replaceFirst('@', '%40')
                 CONFIG_ROLE_ID = credentials('knox-jenkins-jenkins-apps-prod-role-id')
                 AUTHFILE = "auth.json"
-                CAUSE_USER_ID = "${params.userId != null && params.userId != "" ? params.userId : "github@internal"}"
+                DEPLOYMENT_APPROVER = "${params.deploymentApprover != null && params.deploymentApprover != "" ? params.deploymentApprover : "github@internal"}"
                 INTENTION_ID = "${params.intentionId}"
                 DOWNLOAD_URL = "${params.downloadUrl}"
                 DOWNLOAD_TYPE =" ${params.downloadType}"
@@ -137,7 +137,7 @@ pipeline {
                     try {
                         echo "Deploy to ${env.ENV_SHORT} environment"
                         env.ENV_LONG = JenkinsUtil.convertShortEnvToLong("${params.envShort}")
-                        intention = new BrokerIntention(readJSON(file: "app/.jenkins/deployment-intention.json"))
+                        intention = new BrokerIntention(readJSON(file: "app/.jenkins/${env.COMPONENT}-deployment-intention.json"))
                         if (params.envShort == 'dev') {
                             env.PODMAN_ANSIBLE_INVENTORY_PATH = params.devInventoryPath
                         } else if (params.envShort == 'test') {
@@ -146,7 +146,7 @@ pipeline {
                             env.PODMAN_ANSIBLE_INVENTORY_PATH = params.prodInventoryPath
                         }
                         intention.setEventDetails(
-                            userName: env.CAUSE_USER_ID,
+                            userName: env.DEPLOYMENT_APPROVER,
                             url: env.BUILD_URL,
                             provider: env.EVENT_PROVIDER,
                             environment: env.ENV_LONG,
@@ -194,7 +194,7 @@ pipeline {
                                 -v \$(pwd)/downloads:/ansible/downloads \
                                 -e PODMAN_* -e ACTION_TOKEN_* -e COMPONENT*",
                             command: 'ansible-playbook -i inventory/${PODMAN_ANSIBLE_INVENTORY_PATH} \
-                                app/playbooks/playbook.yaml -e "env_vars=dev" -e "proxy_env=dev"')
+                                app/playbooks/playbook.yaml -e "env_vars=${ENV_SHORT}" -e "proxy_env=${ENV_SHORT}"')
                         podman.logout(authfile: "${env.AUTHFILE}")
                         intention.endAction("install")
                         vault.revokeToken()

pipelines/app/Jenkinsfile

@@ -47,13 +47,13 @@ pipeline {
                         env.GITHUB_USER = "${params.githubUser}"
                         env.GITHUB_TOKEN = "${params.githubToken}"
                         wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [[var: env.GITHUB_TOKEN, password: GITHUB_TOKEN]]]) {
-                            sh 'git clone --branch ${GIT_BRANCH} https://${GITHUB_USER}:${GITHUB_TOKEN}@${GIT_REPO} app'
+                            sh 'git config --global advice.detachedHead false ; git clone --branch ${GIT_BRANCH} https://${GITHUB_USER}:${GITHUB_TOKEN}@${GIT_REPO} app'
                             if (DOWNLOAD_TYPE.toUpperCase().trim() == 'GITHUB') {
                                 sh 'cd downloads ; curl -LO "${DOWNLOAD_URL}" -H "Authorization: token ${GITHUB_TOKEN}"'
                             }
                         }
                     } else {
-                        sh 'git clone --branch ${GIT_BRANCH} https://${GIT_REPO} app'
+                        sh 'git config --global advice.detachedHead false ; git clone --branch ${GIT_BRANCH} https://${GIT_REPO} app'
                         if (DOWNLOAD_TYPE.toUpperCase().trim() == 'GITHUB') {
                             sh 'cd downloads ; curl -LO ${DOWNLOAD_URL}'
                         }