canonical-ubuntu-qa team mailing list archive

[Paride Legovini <mp+446193@xxxxxxxxxxxxxxxxxx>]

Paride Legovini has proposed merging ~paride/qa-jenkins-jobs:email-notifications into qa-jenkins-jobs:master.

Commit message:
ISO testing: send desktop notifications to Ubuntu QA

Requested reviews:
  Canonical Platform QA Team (canonical-platform-qa)

For more details, see:
https://code.launchpad.net/~paride/qa-jenkins-jobs/+git/qa-jenkins-jobs/+merge/446193
-- 
Your team Canonical Platform QA Team is requested to review the proposed merge of ~paride/qa-jenkins-jobs:email-notifications into qa-jenkins-jobs:master.

diff --git a/jobs/_common/publishers.yaml b/jobs/_common/publishers.yaml
new file mode 100644
index 0000000..b5ac37e
--- /dev/null
+++ b/jobs/_common/publishers.yaml
@@ -0,0 +1,6 @@
+---
+- publisher:
+    name: email-canonical-ubuntu-qa
+    publishers:
+      - email:
+          recipients: 'canonical-ubuntu-qa@xxxxxxxxxxxxxxxxxxx'
diff --git a/jobs/iso-testing/jobs-server.yaml b/jobs/iso-testing/jobs-server.yaml
index e6512bf..7f47c13 100644
--- a/jobs/iso-testing/jobs-server.yaml
+++ b/jobs/iso-testing/jobs-server.yaml
@@ -132,6 +132,8 @@
 
             # zsync permissiong for the output file are 600, we need 644 for utah
             chmod 644 "$iso"
+    publishers:
+        - email-canonical-ubuntu-qa
 
 - job-template:
     name: 'ubuntu-{release}-{variant}-{arch}-iso-static-validation'
@@ -153,7 +155,7 @@
             arch: '{arch}'
             variant: '{variant}'
     publishers:
-        - email-server-qa
+        - email-canonical-ubuntu-qa
 
 - job-template:
     name: 'ubuntu-{release}-{variant}-{arch}-smoke-default'
@@ -200,7 +202,7 @@
               fail-on-missing: true
               condition: success
         - archive-artifacts-server
-        - email-server-qa
+        - email-canonical-ubuntu-qa
 
 - job-template:
     name: 'ubuntu-{release}-{variant}-{arch}-smoke-{test}'
@@ -223,7 +225,7 @@
             test: '{test}'
     publishers:
         - archive-artifacts-server
-        - email-server-qa
+        - email-canonical-ubuntu-qa
 
 - job-template:
     name: 'ubuntu-{release}-{variant}-{arch}-smoke-edge'
@@ -264,7 +266,7 @@
             iso: 'edge-{release}-{variant}-{arch}.iso'
     publishers:
         - archive-artifacts-server
-        - email-server-qa
+        - email-canonical-ubuntu-qa
 
 
 - builder: # This step runs iso static validation
@@ -343,12 +345,3 @@
             artifacts: '**/*'
             excludes: '*.iso, images/**'
             allow-empty: true
-
-- publisher:
-    name: email-server-qa
-    publishers:
-        - email-ext:
-            recipients: 'server-crew-qa@xxxxxxxxxxxxxxxxxxx'
-            failure: false
-            still-failing: true
-            attach-build-log: true
diff --git a/jobs/iso-testing/jobs.yaml b/jobs/iso-testing/jobs.yaml
index da0aa41..db22242 100644
--- a/jobs/iso-testing/jobs.yaml
+++ b/jobs/iso-testing/jobs.yaml
@@ -47,8 +47,6 @@
         - '{flavor}-{release}-{variant}-{arch}-iso-static-validation'
         - '{flavor}-{release}-{variant}-{arch}-smoke-default'
         - '{flavor}-{release}-{variant}-{arch}-smoke-{desktop-test}'
-    desktop-mailto:
-        - 'jean-baptiste.lallement@xxxxxxxxxxxxx'
 
 - project:
     name: 'iso-testing-udi'
@@ -75,8 +73,6 @@
         - '{flavor}-{release}-{variant}-{arch}-iso-static-validation'
         - '{flavor}-{release}-{variant}-{arch}-smoke-default'
         - '{flavor}-{release}-{variant}-{arch}-smoke-{desktop-test}'
-    desktop-mailto:
-        - 'jean-baptiste.lallement@xxxxxxxxxxxxx'
 
 - project:
     name: 'iso-testing-legacy'
@@ -99,8 +95,6 @@
         - '{flavor}-{release}-{variant}-{arch}-iso-static-validation'
         - '{flavor}-{release}-{variant}-{arch}-smoke-default'
         - '{flavor}-{release}-{variant}-{arch}-smoke-{desktop-test}'
-    desktop-mailto:
-        - 'jean-baptiste.lallement@xxxxxxxxxxxxx'
 
 # builder stanzas describe reusable build steps
 - builder: # This step downloads the iso
@@ -176,12 +170,6 @@
         - junit:
             results: 'utah.xml'
 
-- publisher: # Send email notification on failure
-    name: 'desktop-notifications'
-    publishers:
-        - email:
-            recipients: 'jean-baptiste.lallement@xxxxxxxxxxxxx'
-
 - job:
     name: 'iso-testing-setup'
     description: |
@@ -229,6 +217,8 @@
             variant: '{variant}'
             arch: '{arch}'
             flavor: '{flavor}'
+    publishers:
+        - email-canonical-ubuntu-qa
 
 - job-template:
     name: '{flavor}-{supported-release}-{variant}-{arch}-iso-download'
@@ -256,6 +246,8 @@
             variant: '{variant}'
             arch: '{arch}'
             flavor: '{flavor}'
+    publishers:
+        - email-canonical-ubuntu-qa
 
 - job-template:
     name: '{flavor}-{release}-{variant}-{arch}-iso-static-validation'
@@ -273,6 +265,8 @@
             release: '{release}'
             arch: '{arch}'
             variant: '{variant}'
+    publishers:
+        - email-canonical-ubuntu-qa
 
 - job-template:
     name: '{flavor}-{release}-{variant}-{arch}-smoke-default'
@@ -314,7 +308,7 @@
         - archive-artifacts
         - trigger-mark-pending-current
         - mark-junit
-        - desktop-notifications
+        - email-canonical-ubuntu-qa
 
 - job-template:
     name: '{flavor}-{release}-{variant}-{arch}-smoke-{desktop-test}'
@@ -350,6 +344,7 @@
     publishers:
         - archive-artifacts
         - mark-junit
+        - email-canonical-ubuntu-qa
 
 - job:
     name: 'mark-pending-current'
@@ -383,5 +378,4 @@
 
             ssh -i /var/lib/jenkins/.ssh/cdimage cdimage@cdimage-master.internal "/srv/cdimage.ubuntu.com/bin/mark-current -p $PROJECT -s $RELEASE -t $TYPE -a $ARCH $BUILDSTAMP"
     publishers:
-        - email:
-            recipients: 'paride.legovini@xxxxxxxxxxxxx jean-baptiste.lallement@xxxxxxxxxxxxx'
+        - email-canonical-ubuntu-qa