From f3d9214b31907f2943dbd61ddf4cff657bc87fea Mon Sep 17 00:00:00 2001
From: Jason Froehlich <jfroehli@redhat.com>
Date: Tue, 19 Apr 2022 17:00:28 -0400
Subject: [PATCH] Updated Sonar org and key

---
 tekton/README.md                              |  6 +++---
 tekton/base/triggers/trigger-maven-build.yaml | 14 +++++++-------
 tekton/demo/maven-test/pom.xml                |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tekton/README.md b/tekton/README.md
index 2c32d0e2..8bd312a2 100644
--- a/tekton/README.md
+++ b/tekton/README.md
@@ -294,7 +294,7 @@ spec:
   - name: runSonarScan
     value: 'true'
   - name: sonarProject
-    value: ci-testing
+    value: bcgov_pipeline-templates
   workspaces:
   - name: shared-data
     volumeClaimTemplate:
@@ -375,8 +375,8 @@ For scans with SonarCloud, create a `sonar-project.properties` file at the root
 
 ```conf
 # sonar-project.properties
-sonar.organization=ci-testing
-sonar.projectKey=tekton
+sonar.organization=bcgov-sonarcloud
+sonar.projectKey=bcgov_pipeline-templates
 sonar.host.url=https://sonarcloud.io
 ```
 
diff --git a/tekton/base/triggers/trigger-maven-build.yaml b/tekton/base/triggers/trigger-maven-build.yaml
index e2c7f0d0..ea9c7a5a 100644
--- a/tekton/base/triggers/trigger-maven-build.yaml
+++ b/tekton/base/triggers/trigger-maven-build.yaml
@@ -21,7 +21,7 @@ spec:
       generateName: maven-build-run-
     spec:
       pipelineRef:
-        name: p-maven-build
+        name: p-mvn-build
       params:
       - name: appName
         value: $(tt.params.appName)
@@ -56,7 +56,7 @@ kind: EventListener
 metadata:
   name: maven-build-event-listener
 spec:
-  serviceAccountName: service-tekton-triggers-sa
+  serviceAccountName: pipeline
   triggers:
     - name: github-listener
       interceptors:
@@ -68,9 +68,9 @@ spec:
               - pull_request
               - push
       bindings:
-        - ref: build-push-image-pipeline-binding
+        - ref: maven-build-trigger-binding
       template:
-        ref: build-push-image-template
+        ref: maven-build-trigger
 ---
 apiVersion: triggers.tekton.dev/v1alpha1
 kind: TriggerBinding
@@ -78,9 +78,9 @@ metadata:
   name: maven-build-trigger-binding
 spec:
   params:
-  - name: gitrevision
-    value: $(body.head_commit.id)
-  - name: gitrepositoryurl
+  - name: branchName
+    value: $(body.ref)
+  - name: repoUrl
     value: $(body.repository.url)
   - name: contenttype
     value: $(header.Content-Type)
diff --git a/tekton/demo/maven-test/pom.xml b/tekton/demo/maven-test/pom.xml
index 0b6a285c..01475f87 100644
--- a/tekton/demo/maven-test/pom.xml
+++ b/tekton/demo/maven-test/pom.xml
@@ -16,7 +16,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
-    <sonar.organization>ci-testing</sonar.organization>
+    <sonar.organization>bcgov-sonarcloud</sonar.organization>
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
   </properties>