sts-sponsors team mailing list archive

[Adam Collard <mp+441695@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas-ci/+git/maas-ci-internal:console-not-consoleText into ~maas-committers/maas-ci/+git/maas-ci-internal:main.

Commit message:
Link to console, not consoleText



Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~adam-collard/maas-ci/+git/maas-ci-internal/+merge/441695
-- 
Your team MAAS Committers is requested to review the proposed merge of ~adam-collard/maas-ci/+git/maas-ci-internal:console-not-consoleText into ~maas-committers/maas-ci/+git/maas-ci-internal:main.

diff --git a/jobs/launchpad-ci/job-lander.groovy b/jobs/launchpad-ci/job-lander.groovy
index 514a283..1cad0a8 100644
--- a/jobs/launchpad-ci/job-lander.groovy
+++ b/jobs/launchpad-ci/job-lander.groovy
@@ -7,7 +7,7 @@ def createBuildContextFromJob(job) {
         def test_build_url = test_build.getAbsoluteUrl()
         if (test_result != 'SUCCESS') {
             println "Failed job for $local_job.LP_BRANCH_SRC into $local_job.LP_BRANCH_DEST."
-            sh "ci/launchpad --credentials $CREDS mark-mp --fail-merge ${test_build_url}consoleText --repo-src $local_job.LP_REPO_SRC --branch-src $local_job.LP_BRANCH_SRC --repo-dest $local_job.LP_REPO_DEST --branch-dest $local_job.LP_BRANCH_DEST"
+            sh "ci/launchpad --credentials $CREDS mark-mp --fail-merge ${test_build_url}console --repo-src $local_job.LP_REPO_SRC --branch-src $local_job.LP_BRANCH_SRC --repo-dest $local_job.LP_REPO_DEST --branch-dest $local_job.LP_BRANCH_DEST"
             mattermostSend(color: 'red', message: "[${env.JOB_NAME} #${env.BUILD_NUMBER}](${env.BUILD_URL}) :fire: Failed to merge [${local_job.LP_REPO_SRC}:${local_job.LP_BRANCH_SRC} into ${local_job.LP_REPO_DEST}:${local_job.LP_BRANCH_DEST}](${local_job.LP_MP_LINK})\n \n${local_job.LP_COMMIT_MSG}")
         } else {
             try {
@@ -27,7 +27,7 @@ def createBuildContextFromJob(job) {
             } catch (e) {
                 sh """
                   rm -f message.txt
-                  ci/launchpad --credentials $CREDS mark-mp --fail-merge ${test_build_url}consoleText --repo-src $local_job.LP_REPO_SRC --branch-src $local_job.LP_BRANCH_SRC --repo-dest $local_job.LP_REPO_DEST --branch-dest $local_job.LP_BRANCH_DEST
+                  ci/launchpad --credentials $CREDS mark-mp --fail-merge ${test_build_url}console --repo-src $local_job.LP_REPO_SRC --branch-src $local_job.LP_BRANCH_SRC --repo-dest $local_job.LP_REPO_DEST --branch-dest $local_job.LP_BRANCH_DEST
                   """
                 mattermostSend(color: 'red', message: "[${env.JOB_NAME} #${env.BUILD_NUMBER}](${env.BUILD_URL}) :fire: Failed to merge [${local_job.LP_REPO_SRC}:${local_job.LP_BRANCH_SRC} into ${local_job.LP_REPO_DEST}:${local_job.LP_BRANCH_DEST}](${local_job.LP_MP_LINK})\n \n${local_job.LP_COMMIT_MSG}")
             }
diff --git a/jobs/launchpad-ci/job-reviewer.groovy b/jobs/launchpad-ci/job-reviewer.groovy
index 9df3e55..fee3638 100644
--- a/jobs/launchpad-ci/job-reviewer.groovy
+++ b/jobs/launchpad-ci/job-reviewer.groovy
@@ -8,7 +8,7 @@ def createBuildContextForJob(job) {
         def test_build_url = test_build.getAbsoluteUrl()
         if (test_result != 'SUCCESS') {
             println "Failed job for $local_job.LP_BRANCH_SRC into $local_job.LP_BRANCH_DEST on $series."
-            sh "ci/launchpad --credentials $CREDS mark-mp --fail-review ${test_build_url}consoleText --repo-src $local_job.LP_REPO_SRC --branch-src $local_job.LP_BRANCH_SRC --repo-dest $local_job.LP_REPO_DEST --branch-dest $local_job.LP_BRANCH_DEST --commit $local_job.LP_COMMIT_SHA1"
+            sh "ci/launchpad --credentials $CREDS mark-mp --fail-review ${test_build_url}console --repo-src $local_job.LP_REPO_SRC --branch-src $local_job.LP_BRANCH_SRC --repo-dest $local_job.LP_REPO_DEST --branch-dest $local_job.LP_BRANCH_DEST --commit $local_job.LP_COMMIT_SHA1"
         } else {
             sh "ci/launchpad --credentials $CREDS mark-mp --succeed-review --repo-src $local_job.LP_REPO_SRC --branch-src $local_job.LP_BRANCH_SRC --repo-dest $local_job.LP_REPO_DEST --branch-dest $local_job.LP_BRANCH_DEST --commit $local_job.LP_COMMIT_SHA1"
         }