From: Fatih Degirmenci <fdegir@gmail.com>
Date: Mon, 11 Dec 2017 22:26:41 +0000 (+0000)
Subject: Merge "Remove Matthew Lijun as committer"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=596bb29a5016c10655a2277876d0eca1dca96cea;hp=96fa958a5b666a0ebe7869d0dd62d4fc52d0ee8a;p=releng.git

Merge "Remove Matthew Lijun as committer"
---

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 43e234ce1..eadfbf9ee 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -543,7 +543,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 6cd9de282..f49c7fa1a 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -419,7 +419,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:
diff --git a/jjb/qtip/qtip-verify-jobs.yml b/jjb/qtip/qtip-verify-jobs.yml
index 047d7f2be..f772e3917 100644
--- a/jjb/qtip/qtip-verify-jobs.yml
+++ b/jjb/qtip/qtip-verify-jobs.yml
@@ -191,7 +191,8 @@
 
           mkdir -p $local_path
 
-          git diff HEAD~1 --name-only | grep -E ".+\.ipynb$" | xargs -I '{}' cp '{}' $local_path
+          git diff HEAD~1 --name-status | grep -E "[AM]\t.+\.ipynb$" | awk '{print $2}' \
+            | xargs -I '{}' cp '{}' $local_path
           gsutil -m cp -r "$local_path" "gs://$gs_base/"
 
           echo "Document link(s):" >> gerrit_comment.txt
diff --git a/jjb/releng/opnfv-repo-archiver.sh b/jjb/releng/opnfv-repo-archiver.sh
index 2408c2a83..6fa0aef50 100644
--- a/jjb/releng/opnfv-repo-archiver.sh
+++ b/jjb/releng/opnfv-repo-archiver.sh
@@ -61,6 +61,8 @@ echo "--------------------------------------"
 gsutil cp "$WORKSPACE/opnfv-archive-$DATE.tar.gz" \
     "gs://opnfv-archive/opnfv-archive-$DATE.tar.gz" 2>&1
 
+echo "https://storage.googleapis.com/opnfv-archive/opnfv-archive-$DATE.tar.gz" > archive-link.txt
+
 rm -f opnfv-archive-$DATE.tar.gz
 
 echo "Finished"
diff --git a/jjb/releng/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml
index 80cd08f4e..6f77cd250 100644
--- a/jjb/releng/opnfv-utils.yml
+++ b/jjb/releng/opnfv-utils.yml
@@ -24,8 +24,8 @@
           description: Slaves to prune docker images
           default-slaves:
             - arm-build2
+            - ericsson-build3
             - ericsson-build4
-            - ericsson-build5
             - lf-build2
           allowed-multiselect: true
           ignore-offline-nodes: true
@@ -65,6 +65,19 @@
       - shell:
           !include-raw-escape: opnfv-repo-archiver.sh
 
+    publishers:
+      - email-ext:
+          content-type: 'text'
+          failure: false
+          always: true
+          body:
+            ${{FILE,path="archive-link.txt"}}
+          reply-to: >
+            helpdesk@opnfv.org
+          recipients: >
+            swinslow@linuxfoundation.org
+
+
 - job-template:
     name: 'check-status-of-slaves'