Merge "Make patch-test job deploy to Nexus"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index b6b3af9a2fdff1ce98e6b6a025b9676c725c16a5..5ae653324a33f64fd0ee73d309814b5a664ec0b3 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -95,9 +95,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'satble/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index 6fb0a417b7ed3276925a4fc6f35d6035d2a8bb32..b171973b896d8cd6d3f862c4fb04d5dd2591691f 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -19,11 +19,11 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
-\r
-    # TODO: Delete the following if suites are compatible with Boron again.\r
-    verify-stream: 'carbon'\r
-    # TODO: Remove the lines above and below when carbon becomes the default scit-verify stream.\r
-    verify-branch: 'master'\r
+
+    # TODO: Delete the following if suites are compatible with Boron again.
+    verify-stream: 'carbon'
+    # TODO: Remove the lines above and below when carbon becomes the default scit-verify stream.
+    verify-branch: 'carbon'
     # TODO: Update the line above when stable/carbon is created.
 
     install:

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 0efb7875a234cbe34a40e078aecfbc94ee7afbe2..7406abbfe26ed082422dbc0d7fe6f8cb423427ed 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,39 +1,66 @@
 ---
 - project:
-    name: bier-carbon\r
-    jobs:\r
+    name: bier-nirtogen
+    jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
-\r
-    stream: carbon\r
-    project: 'bier'\r
-    project-name: 'bier'\r
-    branch: 'master'\r
-    jdk: openjdk8\r
-    jdks:\r
+
+    stream: nitrogen
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
       - openjdk8
-    maven:\r
+    maven:
       - mvn33:
           mvn-version: 'mvn33'
-    mvn-settings: 'bier-settings'\r
-    mvn-goals: 'clean install'\r
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'\r
-    dependencies: ''\r
-    email-upstream: '[bier]'\r
-    archive-artifacts: ''\r
-\r
-- project:\r
-    name: bier-sonar\r
-    jobs:\r
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+    archive-artifacts: ''
+
+- project:
+    name: bier-carbon
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: carbon
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/carbon'
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+    archive-artifacts: ''
+
+- project:
+    name: bier-sonar
+    jobs:
       - '{project-name}-sonar'
-\r
-    project: 'bier'\r
-    project-name: 'bier'\r
-    branch: 'master'\r
-    mvn-settings: 'bier-settings'\r
-    mvn-goals: 'clean install'\r
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'\r
+
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index aa68b8e446e73b4e0bb1d31fd8bf7583b0711cba..6a60e24d33e83ddbe201fc0fda9b1e7bfa1614db 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -184,6 +184,8 @@
         armoury-csit-1node-basic-all-nitrogen,
         armoury-csit-1node-basic-only-nitrogen,
         bgpcep-csit-1node-periodic-bgp-ingest-all-nitrogen,
+        bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-nitrogen,
+        bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-nitrogen,
         bgpcep-csit-1node-periodic-bgp-ingest-only-nitrogen,
         bgpcep-csit-1node-periodic-throughpcep-all-nitrogen,
         bgpcep-csit-1node-periodic-throughpcep-only-nitrogen,