Merge "Fix distribution test trigger on failure"

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 67652eab39080ec48a5ecad38272d00881685931..f88c21a5013e60f22059c985d10f3db2eadadf82 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -133,8 +133,12 @@
     name: autorelease-generate-release-notes
     builders:
       - shell: |
-          cd $WORKSPACE/scripts/release_notes_management
-          java -jar target/autonotes.jar
+          # TODO: Remove this condition once stable/beryllium is no longer
+          #       officially maintained.
+          if [ "$GERRIT_BRANCH" != "stable/beryllium" ]; then
+              cd $WORKSPACE/scripts/release_notes_management
+              java -jar target/autonotes.jar
+          fi
 
 - publisher:
     # include-raw-autorelease-notify-build-failure.sh searches console log for

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 63ae08f99415b645c8cd981bf2c3a6410a4897cf..2dbbabd97b270bbe5c143fb320814d168b53d251 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -6,7 +6,8 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
+      # TODO uncomment this line when IoTDM added to Carbon
+      # - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 9697659c20c620e70b5bfd4df1b147efeef6d3e9..1fd19e887fd4ff46c17de24bc463ffe1b49eb6cf 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -294,10 +294,6 @@
         netvirt-csit-1node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-transparent-nitrogen,
-        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
-        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
-        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
-        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-nitrogen,
@@ -493,10 +489,6 @@
         netvirt-csit-1node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-1node-openstack-newton-upstream-transparent-carbon,
-        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
-        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
-        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
-        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-carbon,
@@ -677,10 +669,6 @@
         netvirt-csit-1node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-1node-openstack-newton-upstream-transparent-boron,
-        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-boron,
-        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
-        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-boron,
-        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-boron,