Merge "Update Ubuntu 14.04 gbp images"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index e9abb6145088bc7da3a29805183bc883c7ddc63b..0079def0fb210280cf693a4a4ad83de55e835f5e 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -8,6 +8,7 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - devstack - 20170221-1719
 * CentOS 7 - devstack - 20170606-0344
 * CentOS 7 - devstack - 20170609-0220
+* CentOS 7 - devstack - 20170808-0528
 * CentOS 7 - devstack - newton - 20170117-0005
 * CentOS 7 - devstack-mitaka - 20170130-0523
 * CentOS 7 - devstack-mitaka - 20170314-2255
@@ -15,12 +16,15 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - devstack-newton - 20170314-2256
 * CentOS 7 - devstack-newton - 20170606-0427
 * CentOS 7 - devstack-newton - 20170707-0359
+* CentOS 7 - devstack-newton - 20170808-0528
 * CentOS 7 - devstack-ocata - 20170606-0821
 * CentOS 7 - devstack-ocata - 20170609-0221
+* CentOS 7 - devstack-ocata - 20170808-0528
 * CentOS 7 - docker - 20170117-0003
 * CentOS 7 - docker - 20170120-1434
 * CentOS 7 - docker - 20170607-0203
 * CentOS 7 - docker - 20170609-0220
+* CentOS 7 - docker - 20170808-0528
 * CentOS 7 - java-builder - 20170117-0004
 * CentOS 7 - java-builder - 20170126-0058
 * CentOS 7 - java-builder - 20170309-2355
@@ -29,18 +33,22 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - java-builder - 20170607-1706
 * CentOS 7 - java-builder - 20170609-0259
 * CentOS 7 - java-builder - 20170707-0359
+* CentOS 7 - java-builder - 20170807-1102
+* CentOS 7 - java-builder - 20170807-2145
 * CentOS 7 - robot - 20170117-0004
 * CentOS 7 - robot - 20170210-1803
 * CentOS 7 - robot - 20170328-0206
 * CentOS 7 - robot - 20170526-2050
 * CentOS 7 - robot - 20170606-0345
 * CentOS 7 - robot - 20170609-0220
+* CentOS 7 - robot - 20170808-0529
 * Fedora 23 (20151030 cloud)
 * Ubuntu 14.04 - devstack - 20170117-0004
 * Ubuntu 14.04 - docker - 20170117-0003
 * Ubuntu 14.04 - gbp - 20170117-0042
 * Ubuntu 14.04 - gbp - 20170210-0536
 * Ubuntu 14.04 - gbp - 20170706-1254
+* Ubuntu 14.04 - gbp - 20170808-0524
 * Ubuntu 14.04 - mininet - 20170117-0003
 * Ubuntu 14.04 - mininet - 20170130-0425
 * Ubuntu 14.04 - mininet - 20170207-2055
@@ -48,6 +56,7 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 14.04 - mininet - 20170606-0534
 * Ubuntu 14.04 - mininet - 20170609-0220
 * Ubuntu 14.04 - mininet - 20170611-0950
+* Ubuntu 14.04 - mininet - 20170808-0158
 * Ubuntu 14.04 - mininet-ovs-2.3 - 20170117-0004
 * Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
 * Ubuntu 14.04 - mininet-ovs-23 - 20170130-0415
@@ -63,4 +72,5 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 16.04 - mininet-ovs-25 - 20170606-0534
 * Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 * Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+* Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 * Ubuntu 16.04 LTS (2016-05-03 cloudimg)

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index 276288d11fe84f136a8eaa4d9c9f0c3e4f4db9b1..40057f03b9e2b3d31dc6dc648b157731515628ef 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -351,16 +351,11 @@ need to use the `jenkins-jobs` executable to translate a set of jobs into
 their XML descriptions and upload them to the sandbox Jenkins server.
 
 We document `installing <Installing Jenkins Job Builder_>`_ `jenkins-jobs`
-below. We also provide
-a `pre-built Docker image <jjb-docker_>`_ with `jenkins-jobs` already installed.
+below.
 
 Installing Jenkins Job Builder
 ------------------------------
 
-For users who aren't already experienced with Docker or otherwise don't want
-to use our `pre-built JJB Docker image <jjb-docker_>`_, installing JJB into a
-virtual environment is an equally good option.
-
 We recommend using `pip <Installing JJB using pip_>`_ to assist with JJB
 installs, but we
 also document `installing from a git repository manually
@@ -532,30 +527,6 @@ To validate that JJB was successfully installed you can run this command:
 
     (jjb)$ jenkins-jobs --version
 
-JJB Docker Image
-----------------
-
-`Docker <docker-docs_>`_ is an open platform used to create virtualized Linux containers
-for shipping self-contained applications. Docker leverages LinuX Containers
-\(LXC\) running on the same operating system as the host machine, whereas a
-traditional VM runs an operating system over the host.
-
-.. code-block:: bash
-
-    docker pull zxiiro/jjb-docker
-    docker run --rm -v ${PWD}:/jjb jjb-docker
-
-This `Dockerfile <jjb-dockerfile_>`_ created the
-`zxiiro/jjb-docker image <jjb-docker_>`_.
-By default it will run:
-
-.. code-block:: bash
-
-    jenkins-jobs test .
-
-You'll need to use the `-v/--volume=[]` parameter to mount a directory
-containing your YAML files, as well as a configured `jenkins.ini` file if you
-wish to upload your jobs to the `Jenkins Sandbox`_.
 
 Jenkins Job Templates
 ---------------------
@@ -911,38 +882,7 @@ details, including console output.
 Make changes to your JJB configuration, re-test, re-push and re-run until
 your job is ready.
 
-Docker Method
-^^^^^^^^^^^^^
-
-If `using Docker <JJB Docker image_>`_:
-
-.. code-block:: bash
-
-    # To test
-    docker run --rm -v ${PWD}:/jjb zxiiro/jjb-docker
-
-.. important::
-
-    When pushing with `jenkins-jobs`, a log message with
-    the number of jobs you're pushing will be issued, typically to stdout.
-    **If the number is greater than 1** (or the number of jobs you passed to
-    the command to push) then you are pushing too many jobs and should **`ctrl+c`
-    to cancel the upload**. Else you will flood the system with jobs.
-
-    .. code-block:: bash
-
-          INFO:jenkins_jobs.builder:Number of jobs generated:  1
-
-    **Failing to provide the final `<job-name>` param will push all jobs!**
-
-    .. code-block:: bash
-
-        # To upload jobs to the sandbox
-        # Please ensure that you include a configured jenkins.ini in your volume mount
-        # Making sure not to push more jobs than expected, ctrl+c to abort
-        docker run --rm -v ${PWD}:/jjb zxiiro/jjb-docker jenkins-jobs --conf jenkins.ini update . openflowplugin-csit-periodic-1node-cds-longevity-only-master
 
-.. _docker-docs: https://www.docker.com/whatisdocker/
 .. _example-jenkins.ini: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=jenkins.ini.example
 .. _integration-test-wiki: https://wiki.opendaylight.org/view/Integration/Test
 .. _jenkins-master: https://jenkins.opendaylight.org/releng
@@ -950,8 +890,6 @@ If `using Docker <JJB Docker image_>`_:
 .. _jenkins-sandbox-login: https://jenkins.opendaylight.org/sandbox/login
 .. _jenkins.ini: http://docs.openstack.org/infra/jenkins-job-builder/execution.html#configuration-file
 .. _jjb-autoupdate-project.py: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=scripts/jjb-autoupdate-project.py
-.. _jjb-docker: https://hub.docker.com/r/zxiiro/jjb-docker/
-.. _jjb-dockerfile: https://github.com/zxiiro/jjb-docker/blob/master/Dockerfile
 .. _jjb-docs: http://ci.openstack.org/jenkins-job-builder/
 .. _jjb-init-project.py: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=scripts/jjb-init-project.py
 .. _jjb-repo: https://github.com/openstack-infra/jenkins-job-builder

diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
index 87d5a899d0ff298b94d05209fea08244108a175d..564fbe751cad666518ecd75130bc5d61f96d6327 100644 (file)
--- a/jjb/aaa/aaa-csit-tls.yaml
+++ b/jjb/aaa/aaa-csit-tls.yaml
@@ -31,4 +31,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158

diff --git a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh b/jjb/autorelease/autorelease-get-integration-test-variables.sh
similarity index 100%
rename from jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
rename to jjb/autorelease/autorelease-get-integration-test-variables.sh

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index e298aeb3c994082981da058760ef2af6da8bf82c..d23761bf092badd6b6e1ad715be76e6f8380bb42 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -63,7 +63,7 @@
 - builder:
     name: autorelease-maven-deploy
     builders:
-      - shell: !include-raw: include-raw-autorelease-maven-deploy.sh
+      - shell: !include-raw: autorelease-maven-deploy.sh
 
 - builder:
     name: autorelease-maven-sources
@@ -115,7 +115,7 @@
     name: autorelease-get-integration-test-variables
     builders:
       - integration-set-variables
-      - shell: !include-raw: include-raw-autorelease-get-integration-test-variables.sh
+      - shell: !include-raw: autorelease-get-integration-test-variables.sh
       - inject:
           properties-file: variables.prop
 

diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/autorelease-maven-deploy.sh
similarity index 100%
rename from jjb/autorelease/include-raw-autorelease-maven-deploy.sh
rename to jjb/autorelease/autorelease-maven-deploy.sh

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 6f1fe3be22e241b837ee046e0f613ca4f5eaa264..8929213281964101dcfaa32db2d8533ac69cd44d 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -25,7 +25,7 @@
           extra-mvn-opts: -Dskip.karaf4.featureTest=true
       - boron:
           # Only run once a week since Boron is in maintenance mode
-          cron: 'H H * * 0'
+          cron: 'H 12 * * 0'
           next-release-tag: Boron-SR5
           branch: 'stable/boron'
           jdk: 'openjdk8'

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index ee3bb89c275110aaea145ba77d8a8d6294b3941e..d1e3ec70601c75bfb0e6ddfe46fa82e2dc78198c 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -42,6 +42,12 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - bool:
+          name: TRIGGER_DOWNSTREAM_JOBS
+          default: true
+          description: |
+              Used by the post-build-script step to determine if downstream
+              jobs should be triggered for this run or not.
 
     scm:
       - git:
@@ -113,31 +119,39 @@
 
     publishers:
       - opendaylight-infra-notify-status
-      - trigger-parameterized-builds:
-          - project: 'integration-distribution-test-{integration-test}'
-            condition: UNSTABLE_OR_BETTER
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
-          - project: 'integration-distribution-test-{integration-test}'
-            condition: FAILED
-            trigger-with-no-params: true
-          - project: 'integration-sanity-test-{integration-test}'
-            condition: UNSTABLE_OR_BETTER
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
-          - project: 'integration-sanity-test-{integration-test}'
-            condition: FAILED
-            trigger-with-no-params: true
-          - project: 'packaging-build-rpm-{stream}'
-            condition: UNSTABLE_OR_BETTER
-            predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
-          - project: 'packaging-build-deb-{stream}'
-            condition: UNSTABLE_OR_BETTER
-            predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
+      - postbuildscript:
+          builders:
+            - conditional-step:
+                condition-kind: boolean-expression
+                condition-expression: $TRIGGER_DOWNSTREAM_JOBS
+                steps:
+                  - trigger-builds:
+                      - project: 'integration-distribution-test-{integration-test}'
+                        condition: UNSTABLE_OR_BETTER
+                        property-file: variables.jenkins-trigger
+                        fail-on-missing: true
+                      - project: 'integration-distribution-test-{integration-test}'
+                        condition: FAILED
+                        trigger-with-no-params: true
+                      - project: 'integration-sanity-test-{integration-test}'
+                        condition: UNSTABLE_OR_BETTER
+                        property-file: variables.jenkins-trigger
+                        fail-on-missing: true
+                      - project: 'integration-sanity-test-{integration-test}'
+                        condition: FAILED
+                        trigger-with-no-params: true
+                      - project: 'packaging-build-rpm-{stream}'
+                        condition: UNSTABLE_OR_BETTER
+                        predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
+                        property-file: variables.jenkins-trigger
+                        fail-on-missing: true
+                      - project: 'packaging-build-deb-{stream}'
+                        condition: UNSTABLE_OR_BETTER
+                        predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
+                        property-file: variables.jenkins-trigger
+                        fail-on-missing: true
+          script-only-if-succeeded: false
+          script-only-if-failed: false
       - lf-infra-publish
 
 - job-template:

diff --git a/jjb/autorelease/validate-autorelease-nitrogen.yaml b/jjb/autorelease/validate-autorelease-nitrogen.yaml
index f04af2d94626a88bcf3c2350c66062ed9ae93660..b6efed418cefb691699d0d22778c737485815320 100644 (file)
--- a/jjb/autorelease/validate-autorelease-nitrogen.yaml
+++ b/jjb/autorelease/validate-autorelease-nitrogen.yaml
@@ -45,12 +45,16 @@
           project: lispflowmapping
       - mdsal:
           project: mdsal
+      - nemo:
+          project: nemo
       - netconf:
           project: netconf
       - netvirt:
           project: netvirt
       - neutron:
           project: neutron
+      - nic:
+          project: nic
       - ocpplugin:
           project: ocpplugin
       - of-config:
@@ -75,6 +79,8 @@
           project: ttp
       - unimgr:
           project: unimgr
+      - usc:
+          project: usc
       - vtn:
           project: vtn
       - yangtools:

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 06597d2c0d79e896e129071d9356dcaca446b54c..0bbc7e6206dddec65428b71cbd1f6b7fa7b4f2fa 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -38,7 +38,7 @@
 
     # Mininet configuration
     tools_system_count: 2
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Features to install
     install-features: 'odl-genius-rest'

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 69c978061eee81cac25ff70fb52f02b0fecf6893..8ee7f0b50abb9a60cdf0b9349d5956ecf1e877e4 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -271,6 +271,39 @@
       - opendaylight-infra-stack:
           stack-template: 'csit-3-instance-type.yaml'
 
+# Macro: integration-infra-stack-4-type
+# Operation: Sets environment and then calls opendaylight-infra-stack to spin
+#            up csit lab using openstack-heat.
+# Used by: {project}-csit-* job templates
+
+- builder:
+    name: integration-infra-stack-4-type
+    builders:
+      - integration-cleanup-workspace
+      - shell: |
+          #!/bin/bash
+          # Setup openstack envirnoment file for use by
+          # the opendaylight-infra-stack macro
+          cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
+          parameters:
+              vm_0_count: {vm_0_count}
+              vm_0_flavor: {vm_0_flavor}
+              vm_0_image: {vm_0_image}
+              vm_1_count: {vm_1_count}
+              vm_1_flavor: {vm_1_flavor}
+              vm_1_image: {vm_1_image}
+              vm_2_count: {vm_2_count}
+              vm_2_flavor: {vm_2_flavor}
+              vm_2_image: {vm_2_image}
+              vm_3_count: {vm_3_count}
+              vm_3_flavor: {vm_3_flavor}
+              vm_3_image: {vm_3_image}
+          EOF
+          echo "Contents of opendaylight-infra-environment.yaml ..."
+          cat $WORKSPACE/opendaylight-infra-environment.yaml
+      - opendaylight-infra-stack:
+          stack-template: 'csit-4-instance-type.yaml'
+
 # Macro: integration-get-slave-addresses
 # Operation: this macro gets the IP addresses of the dynamic vms
 # Used by: {project}-csit-* job templates

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index b62b09ccfd8445b50b98387f5701630baccdf1f0..89e41122f3e980c6bdd90a6e26c1d7537367e3bc 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1129,16 +1129,20 @@
       - timed: '{schedule}'
 
     builders:
-      - integration-infra-stack-3-type:
+      - integration-infra-stack-4-type:
+          stack-template: '{stack-template}'
           vm_0_count: '{odl_system_count}'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{openstack_system_count}'
           vm_1_flavor: '{openstack_system_flavor}'
           vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{tools_system_count}'
-          vm_2_flavor: '{tools_system_flavor}'
-          vm_2_image: '{tools_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index edfd0d784d8a809194b3e558c884b5112bcead26..ad523e6ce8145028568809eeb89d625ba883e764 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -51,7 +51,7 @@
           schedule-high-frequency: ''
 
     # tools system image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
 # Template: integration-csit-verify-1node-library
 # Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index 9bc220f4a99f4592e60f00412fd3b23eae759bd8..a5968f3e89919c51da7c640d17e8437bcb3eda09 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -31,7 +31,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Features to install
     install-features: 'odl-lacp-ui'

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 153d9476280186ab41d99a936cad0176f6dcb729..f6a46f2bc8ec127c3d6c726a932ce28bcf2ce69f 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -1,4 +1,17 @@
 ---
+- project:
+    name: lf-infra-ci-workshop
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-ci-workshop
+    project: releng/ci-workshop
+    build-node: centos7-java-builder-2c-4g
+    stream: master
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: LinuxFoundation
+
 - project:
     name: lf-infra-common-packer
     jobs:

diff --git a/jjb/netvirt/include-raw-cleanup-docker.sh b/jjb/netvirt/cleanup-docker.sh
similarity index 100%
rename from jjb/netvirt/include-raw-cleanup-docker.sh
rename to jjb/netvirt/cleanup-docker.sh

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 911e0eb0870ec2e78a0b4084a4f85bbee7855b6e..47bf01dd8b1a2daa18ccc8a18c4bdd8380ecf6be 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -131,14 +131,14 @@
           OVS_VERSION: '{OVS_VERSION}'
           maven-version: '{maven-version}'
           stream: '{stream}'
-      - shell: !include-raw-escape: include-raw-setup-docker.sh
+      - shell: !include-raw-escape: setup-docker.sh
       - inject:
           properties-file: env.properties
       - run-netvirt-sfc-it:
           OVS_VERSION: '{OVS_VERSION}'
           maven-version: '{maven-version}'
           stream: '{stream}'
-      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
+      - shell: !include-raw-escape: cleanup-docker.sh
 
 - job-template:
     name: 'netvirt-daily-full-integration-{stream}'

diff --git a/jjb/netvirt/include-raw-openstack-ci.sh b/jjb/netvirt/openstack-ci.sh
similarity index 100%
rename from jjb/netvirt/include-raw-openstack-ci.sh
rename to jjb/netvirt/openstack-ci.sh

diff --git a/jjb/netvirt/include-raw-setup-docker.sh b/jjb/netvirt/setup-docker.sh
similarity index 100%
rename from jjb/netvirt/include-raw-setup-docker.sh
rename to jjb/netvirt/setup-docker.sh

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
index c54e0892abfcac8f70788820d2128d2b8e6af25e..de04db03b456e9c5ab786bad294a12828c80dba4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
@@ -32,7 +32,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
index 2990ae18d4edb4f1be1ca2df305e9b19efe65afe..ae41e405fafef617b9971bcb03b1d6ab75d770d7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
@@ -32,7 +32,7 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index de3e75387dda4c0862d038b9aa0cd33a600cec8f..d3f3bacd950a51d4a15c8a48c53d06f66fad6775 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -37,4 +37,4 @@
     robot-options: '-v ODL_OF_PLUGIN:lithium'
 
     # mininet image
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
index 01bdaf4956fc92168baf64c5ce81288ce82203b4..0b92711161b5fd654e6d5e2d40e561bac456aa5f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
@@ -41,4 +41,4 @@
     robot-options: '-v flow_update_time:30s'
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 91a71543c5d8d57e532cabb0bd6d951458df2825..452975076bc5082bfb54f83cf690747847731dec 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -39,4 +39,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index 04cbf8a2ac91b56c37d3e4b39191ffb866be54f5..48cf2ddcfe1ef8df87709cccd52c82c42c0f8fcd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -39,7 +39,7 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Plot Info
     01-plot-title: 'Maximum Links Full Mesh Topology'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 3d7542c78a4d6fa7a48da54c84e93ae827580e17..6d4e34805904f730c12844a589f2dd58568e169c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -40,7 +40,7 @@
     robot-options: '-v TEST_LENGTH:23h'
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Trigger jobs (on saturday)
     schedule: 'H H * * 6'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
index c6c53f17a44121c5607154bf84da8fc6f1888b62..b291bf98bebb7ebafbc6cdd1c45e583727705957 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
@@ -30,7 +30,7 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
index e6adcadd674424bb5997e942567a7fdf30bc340d..e707cd7a883b9a457c59a4a09fb996c4c7e6dc0a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
@@ -30,7 +30,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'
 
     # Features to install
     # yamllint disable-line rule:line-length

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 8d6f29461ab5c8b4d21d90c0652a689c907c2e10..651d055082191f411a62d66dbd07e9ebd829dcab 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -36,4 +36,4 @@
     robot-options: '-v SWITCHES:3'
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
index 17c1513db039d6887472857e2520cbc2f4545167..981aa6f7044cc4725a4db6866adfd41122768a37 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
@@ -32,7 +32,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index 39872e910673863f4ace80a13bf4d6c53f226818..a829554d320a6e8ed0920805d09ea4b95fd12210 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -38,7 +38,7 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Plot Info
     01-plot-title: 'Maximum Switches Linear Topology'

diff --git a/jjb/opflex/deps-inc-v1/include-raw-libuv_tgz-build.sh b/jjb/opflex/deps-inc-v1/libuv_tgz-build.sh
similarity index 100%
rename from jjb/opflex/deps-inc-v1/include-raw-libuv_tgz-build.sh
rename to jjb/opflex/deps-inc-v1/libuv_tgz-build.sh

diff --git a/jjb/opflex/deps-inc-v1/include-raw-openvswitch_tgz-build.sh b/jjb/opflex/deps-inc-v1/openvswitch_tgz-build.sh
similarity index 100%
rename from jjb/opflex/deps-inc-v1/include-raw-openvswitch_tgz-build.sh
rename to jjb/opflex/deps-inc-v1/openvswitch_tgz-build.sh

diff --git a/jjb/opflex/deps-inc-v1/include-raw-rapidjson_tgz-build.sh b/jjb/opflex/deps-inc-v1/rapidjson_tgz-build.sh
similarity index 100%
rename from jjb/opflex/deps-inc-v1/include-raw-rapidjson_tgz-build.sh
rename to jjb/opflex/deps-inc-v1/rapidjson_tgz-build.sh

diff --git a/jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh b/jjb/opflex/deps-inc-v2/openvswitch_tgz-build.sh
similarity index 100%
rename from jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh
rename to jjb/opflex/deps-inc-v2/openvswitch_tgz-build.sh

diff --git a/jjb/opflex/include-raw-opflex-build.sh b/jjb/opflex/opflex-build.sh
similarity index 100%
rename from jjb/opflex/include-raw-opflex-build.sh
rename to jjb/opflex/opflex-build.sh

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index fb2c643ce36dd9bd8ee3d804709464f51b41c153..f097117e0c16f41f6f94f3a8c2009b681e865624 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -35,7 +35,7 @@
       - copyartifact:
           project: opflex-openvswitch_tgz-{stream}
           flatten: true
-      - shell: !include-raw-escape: include-raw-opflex-build.sh
+      - shell: !include-raw-escape: opflex-build.sh
 
 - job-template:
     name: 'opflex-verify-{stream}'

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index 1b49ffd13db1ee68797255b4f2ded047aa993c4d..33a4028dd9d9afd88697c8530a322e49e5e7e7c4 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -91,7 +91,7 @@
 - builder:
     name: 'builder-opflex-libuv-v1'
     builders:
-      - shell: !include-raw-escape: deps-inc-v1/include-raw-libuv_tgz-build.sh
+      - shell: !include-raw-escape: deps-inc-v1/libuv_tgz-build.sh
 
 - job-template:
     name: 'opflex-libuv_tgz-{stream}'
@@ -124,7 +124,7 @@
 - builder:
     name: 'builder-opflex-rapidjson-v1'
     builders:
-      - shell: !include-raw-escape: deps-inc-v1/include-raw-rapidjson_tgz-build.sh
+      - shell: !include-raw-escape: deps-inc-v1/rapidjson_tgz-build.sh
 
 - job-template:
     name: 'opflex-rapidjson_tgz-{stream}'
@@ -157,12 +157,12 @@
 - builder:
     name: 'builder-opflex-openvswitch-v1'
     builders:
-      - shell: !include-raw: deps-inc-v1/include-raw-openvswitch_tgz-build.sh
+      - shell: !include-raw: deps-inc-v1/openvswitch_tgz-build.sh
 
 - builder:
     name: 'builder-opflex-openvswitch-v2'
     builders:
-      - shell: !include-raw: deps-inc-v2/include-raw-openvswitch_tgz-build.sh
+      - shell: !include-raw: deps-inc-v2/openvswitch_tgz-build.sh
 
 - job-template:
     name: 'opflex-openvswitch_tgz-{stream}'

diff --git a/jjb/ovsdb/include-raw-cleanup-docker.sh b/jjb/ovsdb/cleanup-docker.sh
similarity index 100%
rename from jjb/ovsdb/include-raw-cleanup-docker.sh
rename to jjb/ovsdb/cleanup-docker.sh

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index c5711b65f08d12dd55137aa42642c5caad196694..fc46b0df833698edf5496a3f64871c4151cd9372 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -80,7 +80,7 @@
     builders:
       - inject:
           properties-content: OVS_VERSION={OVS_VERSION}
-      - shell: !include-raw-escape: include-raw-setup-docker.sh
+      - shell: !include-raw-escape: setup-docker.sh
       - inject:
           properties-file: env.properties
       - run-southbound-it:
@@ -96,7 +96,7 @@
           OVS_VERSION: '{OVS_VERSION}'
           maven-version: '{maven-version}'
           stream: '{stream}'
-      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
+      - shell: !include-raw-escape: cleanup-docker.sh
 
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index f669024a6467ad00903f610462411fd6aa54fcb6..0fd1c418af72c5a85edf9ccff9f10d8873a5000d 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -42,7 +42,7 @@
           name: 'ovsdb'
 
     builders:
-      - shell: !include-raw-escape: include-raw-setup-docker.sh
+      - shell: !include-raw-escape: setup-docker.sh
       - inject:
           properties-file: env.properties
       - shell: !include-raw-escape: include-setup-hwvtep-docker.sh
@@ -90,7 +90,7 @@
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
-      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
+      - shell: !include-raw-escape: cleanup-docker.sh
       - jacoco-nojava-workaround
 
     publishers:

diff --git a/jjb/ovsdb/include-raw-setup-docker.sh b/jjb/ovsdb/setup-docker.sh
similarity index 100%
rename from jjb/ovsdb/include-raw-setup-docker.sh
rename to jjb/ovsdb/setup-docker.sh

diff --git a/jjb/packaging/test-ansible-deb.sh b/jjb/packaging/test-ansible-deb.sh
index 885139e8ca572f0fbb6aaa906a9404ce06486f3e..912a91f52f118906a8fa861fdcc302096e1efabc 100644 (file)
--- a/jjb/packaging/test-ansible-deb.sh
+++ b/jjb/packaging/test-ansible-deb.sh
@@ -17,14 +17,19 @@ $PYTHON -m pip install --upgrade pip
 # and causes our apt commands to fail.
 while pgrep apt > /dev/null; do sleep 1; done
 
-# Install latest ansible
+# Install Ansible
 sudo apt-add-repository ppa:ansible/ansible
 sudo apt-get update
 sudo apt-get install -y ansible
 
-git clone https://github.com/dfarrell07/ansible-opendaylight.git
-cd ansible-opendaylight
-sudo ansible-galaxy install -r requirements.yml
-sudo ansible-playbook -i "localhost," -c local examples/deb_repo_install_playbook.yml
+# Install local version of ansible-opendaylight to path expected by Ansible.
+# Could almost do this by setting ANSIBLE_ROLES_PATH=$WORKSPACE, but Ansible
+# expects the dir containing the role to have the name of role. The JJB project
+# is called "ansible", which causes the cloned repo name to not match the role
+# name "opendaylight". So we need a cp/mv either way and this is simplest.
+sudo cp -R $WORKSPACE/ansible /etc/ansible/roles/opendaylight
+
+# Install OpenDaylight via repo using example Ansible playbook
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/deb_repo_install_playbook.yml
 
 # Add more tests

diff --git a/jjb/packaging/test-ansible-rpm.sh b/jjb/packaging/test-ansible-rpm.sh
index b2c55a43dc06295bcaa593b74ec7c13f78f1c360..b1588a1cd56b3b5ff63d52171581747956667701 100644 (file)
--- a/jjb/packaging/test-ansible-rpm.sh
+++ b/jjb/packaging/test-ansible-rpm.sh
@@ -11,11 +11,18 @@ virtualenv rpm_build
 source rpm_build/bin/activate
 PYTHON="rpm_build/bin/python"
 $PYTHON -m pip install --upgrade pip
+
+# Install Ansible
 sudo yum install -y ansible
 
-git clone https://github.com/dfarrell07/ansible-opendaylight.git
-cd ansible-opendaylight
-sudo ansible-galaxy install -r requirements.yml
-sudo ansible-playbook -i "localhost," -c local examples/odl_6_testing_playbook.yml
+# Install local version of ansible-opendaylight to path expected by Ansible.
+# Could almost do this by setting ANSIBLE_ROLES_PATH=$WORKSPACE, but Ansible
+# expects the dir containing the role to have the name of role. The JJB project
+# is called "ansible", which causes the cloned repo name to not match the role
+# name "opendaylight". So we need a cp/mv either way and this is simplest.
+sudo cp -R $WORKSPACE/ansible /etc/ansible/roles/opendaylight
+
+# Install OpenDaylight via repo using example Ansible playbook
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/odl_6_testing_playbook.yml
 
 # Add more tests

diff --git a/jjb/packaging/test-puppet.sh b/jjb/packaging/test-puppet.sh
index 22b151176cf080fbe0e1c90d5ed2424acdbb12f3..492e7d93410e37965a75fa9fa10b4334c4c3c6fb 100644 (file)
--- a/jjb/packaging/test-puppet.sh
+++ b/jjb/packaging/test-puppet.sh
@@ -7,7 +7,7 @@
 set -ex -o pipefail
 
 # Adapted from puppet-opendaylight/Vagrantfile
-# https://github.com/dfarrell07/puppet-opendaylight/blob/master/Vagrantfile
+# https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging/puppet-opendaylight.git;a=blob;f=Vagrantfile
 
 # Install system-wide dependencies
 # TODO: Are all of these still needed?

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index a8d548b599de4adac4d5887ede76272c92c260d1..a9207c7bacc4a4fdaadeb3bac2ef13f464049a68 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -61,7 +61,7 @@
     docker_system_image: CentOS 7 - docker - 20170609-0220
     odl_system_count: 1
     odl_system_flavor: 4 GB General Purpose v1
-    odl_system_image: CentOS 7 - java-builder - 20170707-0359
+    odl_system_image: CentOS 7 - java-builder - 20170807-2145
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
     openstack_system_image: CentOS 7 - devstack - 20170609-0220
@@ -70,7 +70,7 @@
     openstack_system2_image: CentOS 7 - devstack - 20170609-0220
     tools_system_count: 1
     tools_system_flavor: 2 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet - 20170609-0220
+    tools_system_image: Ubuntu 14.04 - mininet - 20170808-0158
 
     # Default Robot framework options
     robot-options: ''

diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml
index 7bfbf4a8737cb65dbd1027f30cb1ffc47848021c..03b038556e6562b0756b0172a7e3f3cc81e36222 100644 (file)
--- a/jjb/unimgr/unimgr-csit-legato.yaml
+++ b/jjb/unimgr/unimgr-csit-legato.yaml
@@ -41,4 +41,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
index f54f20f5df1484575c5e820c0ef05bf43b834d8c..ef64b7b48c8380fd0cb7a8a81f3950dd3879bfe1 100644 (file)
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ b/jjb/vtn/vtn-csit-3node-manager.yaml
@@ -37,4 +37,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 5d187b80108fd4040b2919565c7f4f839a871f5c..2f1e72cec749885be929c136f08bcea937c63aea 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -20,12 +20,12 @@
           branch: 'stable/carbon'
           jre: 'openjdk8'
           karaf-version: karaf3
-          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     install:
       - only:

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index a40ff12f655497eaae5fd43fb78961c388fbdb57..03bc2157d7dfbb244cbc7a2bc7d82f1b4583196c 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -37,4 +37,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158

diff --git a/openstack-hot/csit-4-instance-type.yaml b/openstack-hot/csit-4-instance-type.yaml
new file mode 100644 (file)
index 0000000..79de0db
--- /dev/null
+++ b/openstack-hot/csit-4-instance-type.yaml
@@ -0,0 +1,118 @@
+---
+heat_template_version: 2016-04-08
+
+parameters:
+    job_name:
+        type: string
+        description: Name of job running this template
+    silo:
+        type: string
+        description: Jenkins Silo job is running in (typically releng|sandbox)
+    vm_0_count:
+        type: number
+        description: Number of VMs for 1st VM type
+    vm_0_flavor:
+        type: string
+        default: 1 GB General Purpose v1
+        description: Flavor to run instance on for 1st VM type
+    vm_0_image:
+        type: string
+        description: Image to run instance on for 1st VM type
+    vm_1_count:
+        type: number
+        description: Number of VMs for 2nd VM type
+    vm_1_flavor:
+        type: string
+        default: 1 GB General Purpose v1
+        description: Flavor to run instance on for 2nd VM type
+    vm_1_image:
+        type: string
+        description: Image to run instance on for 2nd VM type
+    vm_2_count:
+        type: number
+        description: Number of VMs for 3rd VM type
+    vm_2_flavor:
+        type: string
+        default: 1 GB General Purpose v1
+        description: Flavor to run instance on for 3rd VM type
+    vm_2_image:
+        type: string
+    vm_3_count:
+        type: number
+        description: Number of VMs for 3rd VM type
+    vm_3_flavor:
+        type: string
+        default: 1 GB General Purpose v1
+        description: Flavor to run instance on for 3rd VM type
+    vm_3_image:
+        type: string
+
+resources:
+    vm_0_group:
+        type: "OS::Heat::ResourceGroup"
+        properties:
+            count: {get_param: vm_0_count}
+            resource_def:
+                type: generic-server.yaml
+                properties:
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
+                    index: "%index%"
+                    vm_flavor: {get_param: vm_0_flavor}
+                    vm_image: {get_param: vm_0_image}
+
+    vm_1_group:
+        type: "OS::Heat::ResourceGroup"
+        properties:
+            count: {get_param: vm_1_count}
+            resource_def:
+                type: generic-server.yaml
+                properties:
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
+                    index: "%index%"
+                    vm_flavor: {get_param: vm_1_flavor}
+                    vm_image: {get_param: vm_1_image}
+
+    vm_2_group:
+        type: "OS::Heat::ResourceGroup"
+        properties:
+            count: {get_param: vm_2_count}
+            resource_def:
+                type: generic-server.yaml
+                properties:
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
+                    index: "%index%"
+                    vm_flavor: {get_param: vm_2_flavor}
+                    vm_image: {get_param: vm_2_image}
+    vm_3_group:
+        type: "OS::Heat::ResourceGroup"
+        properties:
+            count: {get_param: vm_3_count}
+            resource_def:
+                type: generic-server.yaml
+                properties:
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
+                    index: "%index%"
+                    vm_flavor: {get_param: vm_3_flavor}
+                    vm_image: {get_param: vm_3_image}
+
+outputs:
+    vm_0_ips:
+        description: IP addresses of the 1st vm types
+        value: {get_attr: [vm_0_group, ip]}
+    vm_1_ips:
+        description: IP addresses of the 2nd vm types
+        value: {get_attr: [vm_1_group, ip]}
+    vm_2_ips:
+        description: IP addresses of the 3rd vm types
+        value: {get_attr: [vm_2_group, ip]}
+    vm_3_ips:
+        description: IP addresses of the 4th vm types
+        value: {get_attr: [vm_3_group, ip]}

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 852761030a5a8449c57a64b71eb07ebd9831fd67..6694538f37d1e1c7e5568386b455450b261ad6e4 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -227,9 +227,6 @@ EOF
     cabal install "Cabal<1.18"  # Pull Cabal version that is capable of building shellcheck
     cabal install --bindir=/usr/local/bin "shellcheck-0.4.6"  # Pin shellcheck version
 
-    # openldap dev headers are required for lftools
-    yum install -y openldap-devel
-
     # NLTK_DATA Cache: many jobs that use coala pull down nltk_data
     wget -nv -O /opt/nltk_data.zip https://github.com/nltk/nltk_data/archive/gh-pages.zip
 
@@ -390,9 +387,6 @@ EOF
     cabal update
     cabal install --bindir=/usr/local/bin "shellcheck-0.4.6"  # Pin shellcheck version
 
-    # openldap dev headers are required for lftools
-    ensure_ubuntu_install libldap2-dev libssl-dev libsasl2-dev
-
     # NLTK_DATA Cache: many jobs that use coala pull down nltk_data
     wget -nv -O /opt/nltk_data.zip https://github.com/nltk/nltk_data/archive/gh-pages.zip