Merge "Fix Flavors table syntax"

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index cb0be4c5aba8183b949fcd250baae321f0d4164e..6b07f6c069e0c8f6bdbb348309d846c27e353c03 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -169,9 +169,9 @@ triggered by verify-packer and merge-packer jobs.
 
 Please note that the combination of a Packer definitions from `vars`, `templates`
 and the `provision` scripts is what defines a given minion. For instance, a minion
-may be defined as `centos7-java-builder` which is a combination of Packer OS image
+may be defined as `centos7-builder` which is a combination of Packer OS image
 definitions from `vars/centos.json`, Packer template definitions from
-`templates/java-buidler.json` and spinup scripts from `provision/java-builder.sh`.
+`templates/builder.json` and spinup scripts from `provision/builder.sh`.
 This combination provides the full definition of the realized minion.
 
 Jenkins starts a minion using the latest image which is built and linked into the
@@ -229,15 +229,15 @@ Pool: ODLVEX
 
     <table class="table table-bordered">
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> centos7-java-builder-2c-4g,
-          centos7-java-builder-2c-8g, centos7-java-builder-4c-8g,
-          centos7-java-builder-8c-8g, centos7-java-builder-4c-16g</td>
-        <td><b>Minion Template names</b><br/> centos7-java-builder-2c-4g,
-          centos7-java-builder-2c-4g, centos7-java-builder-2c-8g,
-          centos7-java-builder-4c-8g, centos7-java-builder-8c-8g,
-          centos7-java-builder-4c-16g</td>
+        <td><b>Jenkins Labels</b><br/> centos7-builder-2c-4g,
+          centos7-builder-2c-8g, centos7-java-builder-4c-8g,
+          centos7-builder-8c-8g, centos7-java-builder-4c-16g</td>
+        <td><b>Minion Template names</b><br/> centos7-builder-2c-4g,
+          centos7-builder-2c-4g, centos7-java-builder-2c-8g,
+          centos7-builder-4c-8g, centos7-java-builder-8c-8g,
+          centos7-builder-4c-16g</td>
         <td><b>Packer Template</b><br/>
-        releng/builder/packer/templates/java-builder.json</td>
+        releng/builder/packer/templates/builder.json</td>
         <td><b>Spinup Script</b><br/>
         releng/builder/jenkins-scripts/builder.sh</td>
       </tr>

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index a90a1ddc3d48485fb805cace0486295b0b3d3105..b53a437ec462b49ab6f3faca6099ee6aa7b77332 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -7,7 +7,7 @@
       - 'autorelease-update-validate-jobs-{stream}'
       - 'autorelease-version-bump-{stream}'
       - '{project-name}-validate-autorelease-{stream}':
-          build-node: centos7-java-builder-2c-8g
+          build-node: centos7-builder-2c-8g
       - gerrit-tox-verify
 
     # todo: After Carbon EOL remove next-release-tag and directy pass
@@ -34,7 +34,7 @@
 
     project: releng/autorelease
     project-name: autorelease
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
         **/*.prop

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index ad524858130d61f3a21dfbcceb884c6c3986316e..d868d9e1e79ad706073ba7eea6f0e503d2048c0d 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -16,7 +16,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-java-builder-4c-16g
+    node: centos7-builder-4c-16g
     jdk: '{java-version}'
     cron: 'H 0 * * *'
 
@@ -153,7 +153,7 @@
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
 
     properties:
       - lf-infra-properties:
@@ -212,7 +212,7 @@
 - job-template:
     name: autorelease-version-bump-{stream}
     project-type: freestyle
-    node: centos7-java-builder-4c-16g
+    node: centos7-builder-4c-16g
 
     properties:
       - opendaylight-infra-properties:
@@ -286,7 +286,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
 
     properties:
       - lf-infra-properties:

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index fa6914f898d0cdd6342670822a32824c6781f02c..b80c1eeb106d20151d5e10a9f0f50170dfbe51af 100644 (file)
--- a/jjb/autorelease/autorelease-version-management.yaml
+++ b/jjb/autorelease/autorelease-version-management.yaml
@@ -8,7 +8,7 @@
     project-name: autorelease-version-management
     tox-dir: scripts/version_management
 
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
 
     stream:
       - oxygen:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 8cf9a9682a5da815d717e6d60da8f66379f848dc..2ba4c45cacf67076f2dfad516eda5a542678dec5 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -14,21 +14,31 @@
     stream:
       - oxygen:
           branch: 'master'
+          install-features: >
+              odl-restconf,
+              odl-bgpcep-bgp,
+              odl-bgpcep-bgp-config-example,
+              odl-bgpcep-bmp,
+              odl-bgpcep-bmp-config-example,
+              odl-bgpcep-pcep
+
       - nitrogen:
           branch: 'stable/nitrogen'
+          install-features: >
+              odl-restconf,
+              odl-bgpcep-bgp,
+              odl-bgpcep-bgp-config-example
       - carbon:
           branch: 'stable/carbon'
           karaf-version: karaf3
+          install-features: >
+              odl-restconf,
+              odl-bgpcep-bgp,
+              odl-bgpcep-bgp-config-example
 
     install:
       - only:
           scope: 'only'
 
-    # Features to install
-    install-features: >
-        odl-restconf,
-        odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example
-
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 6519ac216326c9718a97efbe1993d585c1b94247..445e73576bbaf5d777a3e05b47dc2e939a5a2c35 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -11,7 +11,7 @@
     stream: oxygen
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     build-timeout: 120
     branch: 'master'
     jdks:
@@ -46,7 +46,7 @@
     stream: nitrogen
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     build-timeout: 120
     branch: 'stable/nitrogen'
     jdks:
@@ -81,7 +81,7 @@
     stream: carbon
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     build-timeout: 120
     branch: 'stable/carbon'
     karaf-version: karaf3
@@ -112,7 +112,7 @@
 
     project: 'bgpcep'
     project-name: 'bgpcep'
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     branch: 'master'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index f06f6f4899774f92d1fe2d12dca58033038b2b72..6a1c96748b92131fd843be958aacf0f903379bde 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -15,7 +15,7 @@
 
     project: docs
     project-name: docs
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     build-timeout: 30
     rtd-project: opendaylight
     archive-artifacts: ''

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index fc6612ca689fd757e9bcdef571c5055208fdb692..8591893647898ead50816ed85d1f89232224447b 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -23,7 +23,7 @@
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96e9352979521
@@ -52,7 +52,7 @@
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96e9352979521
@@ -82,7 +82,7 @@
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96e9352979521

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index d9d9a76eb61c283f99e1374d0c5a7404e3e0e345..ad581a5fca30bab61b5fc85169efbbb6384e5b99 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -6,7 +6,7 @@
     name: 'distribution-verify-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{jre}'
 
@@ -267,7 +267,7 @@
     # FIXME: List required variables.
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: false
 
     properties:
@@ -313,7 +313,7 @@
     # FIXME: List required variables.
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: false
 
     properties:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 741c47c35b09cc9f4e5552a160e7005ff4cc8ce4..851648d12ac951da4ada9e430b52d499dc75421a 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1407,7 +1407,7 @@
     name: '{project}-patch-test-{feature}-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{jdk}'
 

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 574f20b7805e764523fb31f3fad49596b19a783f..5b7637193dc4ce925e0130b138cf973a7a42c039 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -123,7 +123,7 @@
     name: 'integration-patch-test-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -250,7 +250,7 @@
     # 13. Currently, the .zip lasts 24 hours (?) so you may need to jump to step 2 (or 0) after some time.
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     jdk: '{jdk}'
 
     properties:
@@ -418,7 +418,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
 
     properties:
       - lf-infra-properties:

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 47764567bdf03accde8bcfc5672785035f01715d..a7782ede4796274089382311071821a8c90522cc 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -6,7 +6,7 @@
 
     project-name: lf-infra-ci-workshop
     project: releng/ci-workshop
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     stream: any
     branch: '*'
 
@@ -20,7 +20,7 @@
 
     project-name: lf-infra-common-packer
     project: releng/common-packer
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     stream: any
     branch: '*'
 
@@ -36,7 +36,7 @@
     project-name: lf-infra-docs
     project: releng/docs
     project-pattern: releng/docs
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     rtd-project: lf-releng-docs
     stream: any
     branch: '*'
@@ -52,7 +52,7 @@
     project-name: lf-infra-docs-conf
     project: releng/docs-conf
     project-pattern: releng/docs-conf
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     stream: any
     branch: '*'
 
@@ -68,7 +68,7 @@
     project-name: lf-infra-global-jjb
     project: releng/global-jjb
     project-pattern: releng/global-jjb
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     rtd-project: lf-releng-global-jjb
     stream: any
     branch: '*'
@@ -84,7 +84,7 @@
     project-name: lf-infra-lf-ansible
     project: releng/lf-ansible
     project-pattern: releng/lf-ansible
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     stream: any
     branch: '*'
 
@@ -100,7 +100,7 @@
     project-name: lf-infra-lftools
     project: releng/lftools
     project-pattern: releng/lftools
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     rtd-project: lf-releng-tools
     stream: any
     branch: '*'

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 75cc13b69f21601051e093c5f0c2428c875b99af..fef86deaa46148af046f0acf75647512f3f445c5 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -26,7 +26,7 @@
         **/*.log
         **/target/surefire-reports/*-output.txt
 
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
@@ -55,7 +55,7 @@
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
@@ -85,7 +85,7 @@
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index ffa23c14a1a4f2fc1bf08dd7736ae409e3af722c..94b69ef54d7f36fbbcc0bd492a954b8c419fca99 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -30,7 +30,7 @@
     name: 'opflex-verify-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{jdk}'
 
@@ -91,7 +91,7 @@
 - job-template:
     name: 'opflex-merge-{stream}'
 
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     jdk: '{jdk}'
 
     properties:

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index 0f397673b4b0b7066ea5c3f7680d5e9911f6503e..b772ead2e8fb6b2d6f17129aea1e0bb871423f14 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -37,7 +37,7 @@
     name: 'opflex-libuv-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
 
     group-id: 'libuv'
@@ -92,7 +92,7 @@
     name: 'opflex-rapidjson-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
 
     group-id: 'rapidjson'
@@ -147,7 +147,7 @@
     name: 'opflex-openvswitch-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
 
     group-id: 'openvswitch'

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 7aba1275a92698554e4f6cdf59e7e45e5bfef2ba..1272d6bfadc879c3832f9ce20cf4e317509bb2f1 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -38,7 +38,7 @@
 - job-template:
     name: 'opflex-release-{stream}'
 
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     jdk: '{jdk}'
 
     ######################

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
index f5b147f5f50ddcf634ead81f23d523ea7b744d0e..4729fbdb152166d541e6a724fbbc92db988a99e4 100644 (file)
--- a/jjb/packaging/ansible.yaml
+++ b/jjb/packaging/ansible.yaml
@@ -17,7 +17,7 @@
 - job-template:
     name: '{project-name}-test-rpm-{stream}'
 
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 1884172ad8c06cd807479af6637a5d56b0e4107b..c51975138c695791c7db4a69ac08273cdfb4311f 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -30,7 +30,7 @@
 - job-template:
     name: 'packaging-build-rpm-{stream}'
 
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -108,7 +108,7 @@
 - job-template:
     name: 'packaging-build-rpm-snap-{stream}'
 
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -175,7 +175,7 @@
 - job-template:
     name: 'packaging-verify-rpm-master'
 
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -242,7 +242,7 @@
 - job-template:
     name: 'packaging-verify-full-rpm-master'
 
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -344,7 +344,7 @@
 - job-template:
     name: 'packaging-test-rpm-master'
 
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
 
     parameters:
       - opendaylight-infra-parameters:
@@ -395,7 +395,7 @@
 - job-template:
     name: 'packaging-test-rpm-upgrade-master'
 
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
 
     parameters:
       - opendaylight-infra-parameters:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 8dbbe35b19092db9799d6f793768982f00fa3657..afe99e831b4264af1d80637f2ed9fd3ced8b390c 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -10,7 +10,7 @@
 
     # Timeout in minutes
     build-timeout: 360
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     schedule: ''
     schedule-saturday: 'H H * * 6'
     schedule-weekly: 'H 23 * * 6'
@@ -75,7 +75,7 @@
     docker_system_image: ZZCI - CentOS 7 - docker - 20171209-0317
     odl_system_count: 1
     odl_system_flavor: v1-performance-2
-    odl_system_image: ZZCI - CentOS 7 - java-builder - 20171209-0032
+    odl_system_image: ZZCI - CentOS 7 - builder - 20180109-0417
     openstack_system_count: 1
     openstack_system_flavor: v1-performance-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index c7703ab79f892b011fa0fd4f7683184d5f817a72..6ca3f4772117fabd221f1074bffbdc29f95e4a1c 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -49,8 +49,6 @@
       - devstack-pre-pip-pike:
           build-timeout: 75
       - gbp
-      - java-builder:
-          build-timeout: 75
       - mininet
       - mininet-ovs-2.5:
           build-timeout: 60
@@ -67,8 +65,6 @@
         templates: mininet-ovs-2.5
       - platforms: centos
         templates: mininet-ovs-2.6
-      - platforms: ubuntu-14.04
-        templates: java-builder
       - platforms: ubuntu-14.04
         templates: robot
       - platforms: ubuntu-14.04
@@ -83,8 +79,6 @@
         templates: mininet-ovs-2.5
       - platforms: ubuntu-14.04
         templates: mininet-ovs-2.6
-      - platforms: ubuntu-16.04
-        templates: java-builder
       - platforms: ubuntu-16.04
         templates: robot
       - platforms: ubuntu-16.04

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index 09205d1827bbe0da1a75d0fba775183aaaa8fcc7..f23d7784f2b3af56496aa557b0a1ee6f31d7947f 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -1,4 +1,20 @@
 ---
+- project:
+    name: packer-builder-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-8g
+    build-timeout: 75
+
+    platforms: centos
+    templates: builder
+
 - project:
     name: packer-docker-jobs
     jobs:
@@ -9,7 +25,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     build-timeout: 60
 
     platforms: centos

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 60bbb303757436a8cc7fc0c51ad2eceb496483c8..9b226d93bcde0a76b2641169ca615942a324cfff 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -18,7 +18,7 @@
     name: 'sfc-verify-python-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
 
     properties:

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index a6d4145640492e70fb93a6c49df00ee021c01a13..b3d954bb5a8bbd7a3fda679ed86be6c21962fb4b 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -23,7 +23,7 @@
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
@@ -51,7 +51,7 @@
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
@@ -80,7 +80,7 @@
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index 345f6471319359732d6c153715c2bbbadaaab98e..2b0ebb67131e0b056460f45dde947566184d4f80 100644 (file)
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -24,7 +24,7 @@
     name: 'spectrometer-deploy-webapp-master'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: false
 
     properties:

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 9eaae4f43670e7913febafc23a1cd092eddd21a8..2e0441ed01197da63c01d700bb26aa384d907a6c 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -22,7 +22,7 @@
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
@@ -50,7 +50,7 @@
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
@@ -79,7 +79,7 @@
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51

diff --git a/packer/.gitignore b/packer/.gitignore
new file mode 100644 (file)
index 0000000..a8b42eb
--- /dev/null
+++ b/packer/.gitignore
@@ -0,0 +1 @@
+*.retry

diff --git a/packer/provision/builder.yaml b/packer/provision/builder.yaml
new file mode 100644 (file)
index 0000000..03776b5
--- /dev/null
+++ b/packer/provision/builder.yaml
@@ -0,0 +1,57 @@
+---
+- import_playbook: ../common-packer/provision/baseline.yaml
+
+- hosts: all
+  become_user: root
+  become_method: sudo
+  vars:
+    cassandra_checksum: sha256:a95ba4e2c9345b31310d14507e8889797cc626bc793fd341fff8ff8cba3131cd
+    cassandra_version: 2.1.16
+    elastic_search_checksum: sha256:0aa58947d66b487488e86059352deb7c6cab5da4accdff043cce9fed7c3d2fa7
+    elastic_search_version: 1.7.5
+    hbase_checksum: sha256:9cd990939403fd43dfb665b14603e3772ca3ed813a6e21a81de1778583b35eb8
+    hbase_version: 0.94.27
+
+  pre_tasks:
+    - include_role: name=system-update
+
+  roles:
+    - mono-install
+
+  tasks:
+    - name: 'Fetch Cassandra Server to /tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+      get_url:
+        url: 'https://archive.apache.org/dist/cassandra/{{cassandra_version}}/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+        dest: '/tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+        checksum: '{{cassandra_checksum}}'
+    - name: 'Fetch Elastic Search to /tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
+      get_url:
+        url: 'https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-{{elastic_search_version}}.tar.gz'
+        dest: '/tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
+        checksum: '{{elastic_search_checksum}}'
+    - name: 'Fetch HBase to /tmp/hbase-{{hbase_version}}.tar.gz'
+      get_url:
+        url: 'https://archive.apache.org/dist/hbase/hbase-{{hbase_version}}/hbase-{{hbase_version}}.tar.gz'
+        dest: '/tmp/hbase-{{hbase_version}}.tar.gz'
+        checksum: '{{hbase_checksum}}'
+    - name: Install Quagga
+      block:
+        - name: Fetch Quagga git repo
+          git:
+            repo: https://github.com/6WIND/zrpcd.git
+            dest: /tmp/build_quagga/zrpcd
+            version: 20170731
+        - name: Set compile script executable
+          file:
+            path: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
+            mode: 0755
+        - name: Compile Quagga
+          shell: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
+          args:
+            chdir: /tmp/build_quagga/zrpcd
+          become: true
+
+  post_tasks:
+    - name: System Reseal
+      script: ../common-packer/provision/system-reseal.sh
+      become: true

diff --git a/packer/provision/java-builder.sh b/packer/provision/java-builder.sh
deleted file mode 100644 (file)
index c65db9c..0000000
--- a/packer/provision/java-builder.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-# vim: sw=4 ts=4 sts=4 et tw=72 :
-
-# Force any errors to cause the script and job to end in failure
-set -xeu -o pipefail
-
-# The following packages are not needed by all projects, but they are
-# needed by enough to make them useful everywhere
-yum install -y @development perl-{Digest-SHA,ExtUtils-MakeMaker} \
-    ant {boost,gtest,json-c,libcurl,libxml2,libvirt,openssl}-devel \
-    {readline,unixODBC}-devel yum-utils fedora-packager \
-    libxslt-devel crudini
-
-# Needed by autorelease scripts
-yum install -y xmlstarlet
-
-# Needed by docs project
-yum install -y graphviz
-
-# Needed by deploy test
-yum install -y sshpass
-
-#########################
-# Integration/Packaging #
-#########################
-
-# Install software for building RPMs
-yum install -y fedora-packager
-
-# Needed for vsemprovider build in vtn project to enable C# compilation.
-rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
-# Add the mono tools repository
-yum-config-manager -y --add-repo http://download.mono-project.com/repo/centos/
-# Install the mono toolchain and nuget
-yum -y install mono-complete nuget
-
-# Needed by TSDR
-echo "---> Installing the Hbase Server..."
-mkdir /tmp/Hbase
-cd /tmp/Hbase
-wget -nv https://archive.apache.org/dist/hbase/hbase-0.94.27/hbase-0.94.27.tar.gz
-tar -xvf hbase-0.94.27.tar.gz
-
-# Needed by TSDR
-echo "---> Installing the Cassandra Server..."
-mkdir /tmp/cassandra
-cd /tmp/cassandra
-wget -nv https://archive.apache.org/dist/cassandra/2.1.16/apache-cassandra-2.1.16-bin.tar.gz
-tar -xvf apache-cassandra-2.1.16-bin.tar.gz
-
-# Generally useful for all projects
-echo "---> Installing the Elasticsearch node..."
-mkdir /tmp/elasticsearch
-cd /tmp/elasticsearch
-wget -nv https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.tar.gz
-tar -xvzf elasticsearch-1.7.5.tar.gz
-
-# Installs Hashicorp's Packer binary, required for {verify,merge}-packer jobs
-mkdir /tmp/packer
-cd /tmp/packer
-wget -nv https://releases.hashicorp.com/packer/1.1.3/packer_1.1.3_linux_amd64.zip
-unzip packer_1.1.3_linux_amd64.zip -d /usr/local/bin/
-# rename packer to avoid conflict with binary in cracklib
-mv /usr/local/bin/packer /usr/local/bin/packer.io
-
-# Check out quagga , compile and install for router functionalities
-echo "Installing the Quagga..."
-mkdir -p /tmp/build_quagga
-cd /tmp/build_quagga
-git clone https://github.com/6WIND/zrpcd.git
-cd zrpcd
-git checkout 20170731
-chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
-
-# Removing the build_quagga folder
-rm -rf /tmp/build_quagga/

diff --git a/packer/templates/autorelease.json b/packer/templates/autorelease.json
deleted file mode 100644 (file)
index 76aef74..0000000
--- a/packer/templates/autorelease.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
-    "distro": null,
-    "cloud_user_data": null,
-    "ssh_proxy_host": ""
-  },
-  "builders": [
-    {
-      "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
-      "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
-      "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
-      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - autorelease - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "v1-standard-4",
-      "networks": [
-        "{{user `public_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}",
-      "metadata": {
-        "ci_managed": "yes"
-      }
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "shell",
-      "scripts": [
-        "provision/baseline.sh",
-        "provision/java-builder.sh",
-        "provision/system_reseal_local_env.sh",
-        "provision/system_reseal.sh"
-      ],
-      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
-    }
-  ]
-}

diff --git a/packer/templates/builder.json b/packer/templates/builder.json
new file mode 100644 (file)
index 0000000..54b5aa7
--- /dev/null
+++ b/packer/templates/builder.json
@@ -0,0 +1,59 @@
+{
+  "variables": {
+    "base_image": null,
+    "distro": null,
+    "cloud_auth_url": null,
+    "cloud_user": null,
+    "cloud_pass": null,
+    "cloud_network": null,
+    "cloud_tenant": null,
+    "cloud_user_data": null,
+    "ssh_user": null,
+    "ssh_proxy_host": ""
+  },
+  "builders": [
+    {
+      "name": "vexxhost",
+      "image_name": "ZZCI - {{user `distro`}} - builder - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `base_image`}}",
+      "type": "openstack",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "domain_name": "Default",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
+      "networks": [
+        "{{user `cloud_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "ssh_username": "{{user `ssh_user`}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "flavor": "v1-standard-1",
+      "metadata": {
+        "ci_managed": "yes"
+      }
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "common-packer/provision/install-python.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    },
+    {
+      "type": "ansible",
+      "playbook_file": "provision/builder.yaml",
+      "ansible_env_vars": [
+        "ANSIBLE_NOCOWS=1",
+        "ANSIBLE_PIPELINING=True",
+        "ANSIBLE_ROLES_PATH=../lf-ansible/roles",
+        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+        "ANSIBLE_STDOUT_CALLBACK=debug"
+      ]
+    }
+  ]
+}

diff --git a/packer/templates/java-builder.json b/packer/templates/java-builder.json
deleted file mode 100644 (file)
index 0e0d217..0000000
--- a/packer/templates/java-builder.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
-    "distro": null,
-    "cloud_user_data": null,
-    "ssh_proxy_host": ""
-  },
-  "builders": [
-    {
-      "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
-      "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
-      "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
-      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "v1-standard-1",
-      "networks": [
-        "{{user `public_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}",
-      "metadata": {
-        "ci_managed": "yes"
-      }
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "shell",
-      "scripts": [
-        "provision/baseline.sh",
-        "provision/java-builder.sh",
-        "provision/system_reseal_local_env.sh",
-        "provision/system_reseal.sh"
-      ],
-      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
-    }
-  ]
-}