Merge "Simple change to run a script stored in integration before controller starts"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Thu, 28 May 2015 12:48:29 +0000 (12:48 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 28 May 2015 12:48:29 +0000 (12:48 +0000)
30 files changed:
jenkins-scripts/mininet-fedora.sh [new file with mode: 0755]
jjb/integration/integration-csit-basic.yaml [moved from jjb/integration/integration-csit-basic-master.yaml with 91% similarity]
jjb/integration/integration-jobs.yaml
jjb/integration/integration-patch-test-stable-lithium.yaml [deleted file]
jjb/integration/integration-python.yaml
jjb/iotdm/iotdm-csit-basic.yaml [moved from jjb/iotdm/iotdm-csit-basic-master.yaml with 81% similarity]
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml [moved from jjb/l2switch/l2switch-csit-host-scalability-daily-master.yaml with 87% similarity]
jjb/l2switch/l2switch-csit-scalability.yaml [moved from jjb/l2switch/l2switch-csit-scalability-master.yaml with 89% similarity]
jjb/l2switch/l2switch-csit-switch.yaml [moved from jjb/l2switch/l2switch-csit-switch-master.yaml with 89% similarity]
jjb/lispflowmapping/lispflowmapping-csit-all.yaml [moved from jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml with 89% similarity]
jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml [moved from jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml with 89% similarity]
jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml [moved from jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml with 90% similarity]
jjb/openflowplugin/openflowplugin-csit-config-performance.yaml [moved from jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml with 88% similarity]
jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml [moved from jjb/openflowplugin/openflowplugin-csit-flow-services-more-master.yaml with 81% similarity]
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml [moved from jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml with 88% similarity]
jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml [moved from jjb/openflowplugin/openflowplugin-csit-scalability-daily-master.yaml with 87% similarity]
jjb/openflowplugin/openflowplugin-csit-scalability.yaml [moved from jjb/openflowplugin/openflowplugin-csit-scalability-master.yaml with 88% similarity]
jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml [new file with mode: 0644]
jjb/tsdr/tsdr-csit-tsdr.yaml [moved from jjb/tsdr/tsdr-csit-tsdr-master.yaml with 90% similarity]
jjb/usc/usc-csit-channel.yaml [moved from jjb/usc/usc-csit-channel-master.yaml with 89% similarity]
jjb/vpnservice/vpnservice-csit-vpnservice.yaml [moved from jjb/vpnservice/vpnservice-csit-vpnservice-master.yaml with 88% similarity]
jjb/vtn/vtn-csit-manager.yaml [moved from jjb/vtn/vtn-csit-manager-master.yaml with 90% similarity]
vagrant/basic-builder/bootstrap.sh
vagrant/basic-java-node/bootstrap.sh
vagrant/basic-mininet-fedora-node/README.md [new file with mode: 0644]
vagrant/basic-mininet-fedora-node/Vagrantfile [new file with mode: 0644]
vagrant/basic-mininet-fedora-node/bootstrap.sh [new file with mode: 0644]
vagrant/basic-mininet-fedora-node/system_reseal.sh [new file with mode: 0644]
vagrant/lf-networking/configure_lf_infra.sh
vagrant/rackspace-convert-base/bootstrap.sh

diff --git a/jenkins-scripts/mininet-fedora.sh b/jenkins-scripts/mininet-fedora.sh
new file mode 100755 (executable)
index 0000000..5fc0579
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# make sure we don't require tty for sudo operations
+cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
+Defaults:jenkins !requiretty
+jenkins     ALL = NOPASSWD: ALL
+EOF
+
+# make sure the firewall is stopped
+service iptables stop
+
+# vim: sw=2 ts=2 sts=2 et :
similarity index 91%
rename from jjb/integration/integration-csit-basic-master.yaml
rename to jjb/integration/integration-csit-basic.yaml
index 1e7e6aa665c21a473188f4a048b3a999783deacf..a424ba33f54eb4bb53dd7b961eee4decb87d5899 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: integration-csit-basic-master
+    name: integration-csit-basic
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
@@ -15,6 +15,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable-lithium'
 
     install:
         - only:
index 63b243db64486ee34a3a84af520b8a7886d20372..9fd9e403e72fa797a7315d9e00fc11276db8da0a 100644 (file)
@@ -1,6 +1,6 @@
 
 - project:
-    name: integration
+    name: integration-jobs
     jobs:
         - 'integration-csit-verify-{stream}'
         - 'integration-distribution-verify-{stream}'
             branch: 'master'
             csit-list: 'controller-csit-1node-cds-netconf-only-{stream},controller-csit-1node-cds-netconf-all-{stream},aaa-csit-1node-cds-authn-only-{stream},aaa-csit-1node-cds-authn-all-{stream},openflowplugin-csit-1node-cds-flow-services-only-{stream},openflowplugin-csit-1node-cds-flow-services-all-{stream},openflowplugin-csit-1node-cds-scalability-only-{stream},openflowplugin-csit-1node-cds-scalability-all-{stream},openflowplugin-csit-1node-cds-cbench-performance-only-{stream},openflowplugin-csit-1node-cds-config-performance-only-{stream},l2switch-csit-1node-cds-switch-only-{stream},l2switch-csit-1node-cds-switch-all-{stream},l2switch-csit-1node-cds-scalability-only-{stream},l2switch-csit-1node-cds-scalability-all-{stream},vtn-csit-1node-cds-manager-only-{stream},vtn-csit-1node-cds-manager-all-{stream},lispflowmapping-csit-1node-cds-all-only-{stream},lispflowmapping-csit-1node-cds-all-all-{stream}'
 
+        - stable-lithium:
+            branch: 'stable/lithium'
+            csit-list: 'controller-csit-1node-cds-netconf-only-{stream},controller-csit-1node-cds-netconf-all-{stream},aaa-csit-1node-cds-authn-only-{stream},aaa-csit-1node-cds-authn-all-{stream},openflowplugin-csit-1node-cds-flow-services-only-{stream},openflowplugin-csit-1node-cds-flow-services-all-{stream},openflowplugin-csit-1node-cds-scalability-only-{stream},openflowplugin-csit-1node-cds-scalability-all-{stream},openflowplugin-csit-1node-cds-cbench-performance-only-{stream},openflowplugin-csit-1node-cds-config-performance-only-{stream},l2switch-csit-1node-cds-switch-only-{stream},l2switch-csit-1node-cds-switch-all-{stream},l2switch-csit-1node-cds-scalability-only-{stream},l2switch-csit-1node-cds-scalability-all-{stream},vtn-csit-1node-cds-manager-only-{stream},vtn-csit-1node-cds-manager-all-{stream},lispflowmapping-csit-1node-cds-all-only-{stream},lispflowmapping-csit-1node-cds-all-all-{stream}'
+
         - stable-helium:
             branch: 'stable/helium'
             csit-list: 'controller-csit-1node-imds-nsf-only-{stream},controller-csit-1node-imds-nsf-all-{stream},controller-csit-1node-imds-netconf-only-{stream},controller-csit-1node-imds-netconf-all-{stream},aaa-csit-1node-imds-authn-only-{stream},aaa-csit-1node-imds-authn-all-{stream},openflowplugin-csit-1node-imds-flow-services-only-{stream},openflowplugin-csit-1node-imds-flow-services-all-{stream},l2switch-csit-1node-imds-switch-only-{stream},l2switch-csit-1node-imds-switch-all-{stream},vtn-csit-1node-imds-manager-only-{stream},vtn-csit-1node-imds-manager-all-{stream},lispflowmapping-csit-1node-imds-all-only-{stream},lispflowmapping-csit-1node-imds-all-all-{stream}'
diff --git a/jjb/integration/integration-patch-test-stable-lithium.yaml b/jjb/integration/integration-patch-test-stable-lithium.yaml
deleted file mode 100644 (file)
index 23f3f20..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-- project:
-    name: integration-job-patch-test-stable-lithium
-    jobs:
-        - 'integration-patch-test-stable-lithium'
-
-    jdk: 'openjdk7'
-
-- job-template:
-    name: 'integration-patch-test-stable-lithium'
-
-    project-type: maven
-    node: dynamic_verify
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: 'integration'
-        - integration-patch-git-url
-
-    scm:
-        - integration-gerrit-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: 'stable/lithium'
-        - integration-git-scm:
-            credentials-id: '{ssh-credentials}'
-            branch: 'master'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'test-integration'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '**'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/stable/lithium'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
-
-    prebuilders:
-        - integration-get-bundle-url
-        - inject:
-            properties-file: 'bundle.txt'
-        - wipe-org-opendaylight-repo
-        - maven-target:
-            maven-version: '{mvn32}'
-            pom: '$GERRIT_PROJECT/pom.xml'
-            goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
-            java-opts:
-                - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-            settings: '{integration-settings}'
-            global-settings: '{odl-global-settings}'
-
-    maven:
-        maven-name: '{mvn32}'
-        root-pom: 'integration/pom.xml'
-        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{integration-settings}'
-        global-settings: '{odl-global-settings}'
-        ignore-upstream-changes: true
-
-    postbuilders:
-        - trigger-builds:
-            - project: 'integration-distribution-test-master'
-              block: true
-              predefined-parameters:
-                  BUNDLEURL=$BUNDLEURL
-
-    publishers:
-        - email-notification:
-            email-prefix: '[integration]'
-
index 2918a15504fc02e52fad8bf62cf7a774f3682a27..4f499768fdaa1a497b7698672d23cfe61bd7ae24 100644 (file)
@@ -8,6 +8,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable-lithium'
 
     project: 'integration'
     jdk: 'openjdk7'
similarity index 81%
rename from jjb/iotdm/iotdm-csit-basic-master.yaml
rename to jjb/iotdm/iotdm-csit-basic.yaml
index a38788d7e1fcb0d06b1eb383f06fcff94655960b..d72e8f2a2fcc8136e68e85c18d969534e3f1cd5b 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: iotdm-csit-basic-master
+    name: iotdm-csit-basic
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
@@ -28,4 +30,4 @@
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'iotdm-distribution-{stream}'
\ No newline at end of file
+    trigger-jobs: 'iotdm-distribution-{stream}'
similarity index 87%
rename from jjb/l2switch/l2switch-csit-host-scalability-daily-master.yaml
rename to jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index e666679147bf54905a727354ce80ececcdf0ef89..d051cbbaf748f478f66afdb9d46c079f098376bb 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: l2switch-csit-host-scalability-daily-master
+    name: l2switch-csit-host-scalability-daily
     jobs:
         - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 89%
rename from jjb/l2switch/l2switch-csit-scalability-master.yaml
rename to jjb/l2switch/l2switch-csit-scalability.yaml
index d58bb630a94edc4e26c7f875ecefe0bc2458739c..6319e6d4ef037ecb3f5fefddd76e9dd279a91a73 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: l2switch-csit-scalability-master
+    name: l2switch-csit-scalability
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 89%
rename from jjb/l2switch/l2switch-csit-switch-master.yaml
rename to jjb/l2switch/l2switch-csit-switch.yaml
index 8de156ee3bdfcd59393c47c1bbefec4771002b10..0b162eedaeb2ce617291bd52f157383862554bd2 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: l2switch-csit-switch-master
+    name: l2switch-csit-switch
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 89%
rename from jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml
rename to jjb/lispflowmapping/lispflowmapping-csit-all.yaml
index 535a8126a3612865953f976da5e8741c22d48f1e..11545965b2ddea84bc76d82273652aaf6c2348c1 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: lispflowmapping-csit-all-master
+    name: lispflowmapping-csit-all
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 89%
rename from jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index b44a1f45d3ee956c2156e4096e3a58bbbcd934d4..af4f6ceb50129085e50e0a0cf2c0c54802d137ea 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-cbench-daily-master
+    name: openflowplugin-csit-cbench-daily
     jobs:
         - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 90%
rename from jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index d9afacbf63cef0598c8173ed046100be728a5fcd..f8ad74192869134d0eea2114704d3d9a4222d6ac 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-cbench-performance-master
+    name: openflowplugin-csit-cbench-performance
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
index 97629e639ff3ce311258e4925a62a1d7dd0fff68..2b0284ab07b08d4d8b054fc091ebf445923d5df3 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-config-performance-master
+    name: openflowplugin-csit-config-performance
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 81%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services-more-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
index 986c54e9b26c02bf525ef58e744f1045da6af32c..5395c553e89c7ce7ca38e005f3c021b9bf66f315 100644 (file)
@@ -1,7 +1,8 @@
 - project:
-    name: openflowplugin-csit-flow-services-more-master
+    name: openflowplugin-csit-flow-services-more
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -13,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 0701f1424a7630b01c17476b9e958299b9c9c7a9..9f2539ee8e5ffd501a0a3d6f465c9c8c5d67b0c4 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-flow-services-master
+    name: openflowplugin-csit-flow-services
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 87%
rename from jjb/openflowplugin/openflowplugin-csit-scalability-daily-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
index 9ba223c3c2d40db5e39297c5e1ade186ce6250df..bc8d2de8a0c4d78be600d9a42b63800ba987bf10 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-scalability-daily-master
+    name: openflowplugin-csit-scalability-daily
     jobs:
         - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-scalability-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index d28c8aa6865599d05919b14da56ec54a72b75bcc..664e6fe217e6d53143e506acaa66c36d77c0189c 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-scalability-master
+    name: openflowplugin-csit-scalability
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
diff --git a/jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml b/jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml
new file mode 100644 (file)
index 0000000..0f7db08
--- /dev/null
@@ -0,0 +1,32 @@
+- project:
+    name: tsdr-csit-tsdr-h2
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'tsdr'
+
+    # The functionality under test to verify
+    functionality: 'h2-datastore'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-tsdr-all'
+
+    # Robot custom options
+    robot-options: ' '
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
+
similarity index 90%
rename from jjb/tsdr/tsdr-csit-tsdr-master.yaml
rename to jjb/tsdr/tsdr-csit-tsdr.yaml
index 6b31940e2238c4a9c14d30a79b12e116d9193347..93f2f3b5e381ccdd99c7fe8656ed0720e435826e 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: tsdr-csit-tsdr-master
+    name: tsdr-csit-tsdr
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 89%
rename from jjb/usc/usc-csit-channel-master.yaml
rename to jjb/usc/usc-csit-channel.yaml
index 9ceeeabc2cdb859059237f0f0baf6b54043d83fd..89b907b50dc84836c027f52dd2561d6299acad69 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: usc-csit-channel-master
+    name: usc-csit-channel
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 88%
rename from jjb/vpnservice/vpnservice-csit-vpnservice-master.yaml
rename to jjb/vpnservice/vpnservice-csit-vpnservice.yaml
index c92e5d4edbcd38878f723814848ef19f4922ca3f..db226cd245b828a999b5e13d56f23400a7f59ccb 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: vpnservice-csit-vpnservice-master
+    name: vpnservice-csit-vpnservice
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 90%
rename from jjb/vtn/vtn-csit-manager-master.yaml
rename to jjb/vtn/vtn-csit-manager.yaml
index 81643c3d92b813c5fce015d85a998b5b9ea87c6b..b12b79106c2a3fb608d665a6f403fbba462c651d 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: vtn-csit-manager-master
+    name: vtn-csit-manager
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
index c3a2eef2bf8dfc4805af1572147960e74f976239..24aed3c7b54cfa8de03aafce71afe7037d08a3e0 100644 (file)
@@ -3,38 +3,15 @@
 # vim: sw=4 ts=4 sts=4 et tw=72 :
 
 yum clean all
-# Add the ODL yum repo (not needed for java nodes, but useful for
-# potential later layers)
-yum install -q -y https://nexus.opendaylight.org/content/repositories/opendaylight-yum-epel-6-x86_64/rpm/opendaylight-release/0.1.0-1.el6.noarch/opendaylight-release-0.1.0-1.el6.noarch.rpm
 
 # Make sure the system is fully up to date
 yum update -q -y
 
-# Add in git (needed for most everything) and XML-XPath as it is useful
-# for doing CLI based CML parsing of POM files
-yum install -q -y git perl-XML-XPath
-
-# install all available openjdk-devel sets
-yum install -q -y 'java-*-openjdk-devel'
-
-# we currently use Java7 (aka java-1.7.0-openjdk) as our standard make
-# sure that this is the java that alternatives is pointing to, dynamic
-# spin-up scripts can switch to any of the current JREs installed if
-# needed
-alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
-alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
-
-# To handle the prompt style that is expected all over the environment
-# with how use use robotframework we need to make sure that it is
-# consistent for any of the users that are created during dynamic spin
-# ups
-echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
-
 # The following packages are not needed by all projects, but they are
 # needed by enough to make them useful everywhere
 yum install -q -y @development perl-{Digest-SHA,ExtUtils-MakeMaker} \
     ant {boost,gtest,json-c,libcurl,libxml2,libvirt,openssl}-devel \
-    {readline,unixODBC}-devel
+    {readline,unixODBC}-devel yum-utils
 
 # tcpmd5 is wanting to do 32bit ARM cross-compilation and is specifically
 # requesting the following be installed (note the kernel headers are
@@ -46,11 +23,9 @@ yum install -q -y glibc-devel.i686 kernel-headers
 # an EL6 system some of these packages are not availalble (or at the
 # wrong version) in publically available repositories as such this
 # should only really be done on an EL7 (or F18+) system
-yum install -q -y {jansson,libevent,libevent2,libnl,libuuid}-devel \
-    python-{devel,virtualenv,setuptools}
+yum install -q -y {jansson,libevent,libnl,libuuid}-devel \
+    python-{devel,virtualenv,setuptools,pip}
 
-#get yum-config-manager
-yum -q -y install yum-utils
 #The following is needed for the new code in vtn project.
 #these packages will enable C# compilation.
 rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
index 1ae6a2a33b47eaa019657b5eff5bdd8448744085..7cdb8125780cd46a14298e36c83b82784d896e91 100644 (file)
@@ -3,29 +3,8 @@
 # vim: sw=4 ts=4 sts=4 et tw=72 :
 
 yum clean all
-# Add the ODL yum repo (not needed for java nodes, but useful for
-# potential later layers)
-yum install -q -y https://nexus.opendaylight.org/content/repositories/opendaylight-yum-epel-6-x86_64/rpm/opendaylight-release/0.1.0-1.el6.noarch/opendaylight-release-0.1.0-1.el6.noarch.rpm
 
 # Make sure the system is fully up to date
 yum update -q -y
 
-# Add in git (needed for most everything) and XML-XPath as it is useful
-# for doing CLI based CML parsing of POM files
-yum install -q -y git perl-XML-XPath
 
-# install all available openjdk-devel sets
-yum install -q -y 'java-*-openjdk-devel'
-
-# we currently use Java7 (aka java-1.7.0-openjdk) as our standard make
-# sure that this is the java that alternatives is pointing to, dynamic
-# spin-up scripts can switch to any of the current JREs installed if
-# needed
-alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
-alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
-
-# To handle the prompt style that is expected all over the environment
-# with how use use robotframework we need to make sure that it is
-# consistent for any of the users that are created during dynamic spin
-# ups
-echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
diff --git a/vagrant/basic-mininet-fedora-node/README.md b/vagrant/basic-mininet-fedora-node/README.md
new file mode 100644 (file)
index 0000000..16a6fe2
--- /dev/null
@@ -0,0 +1,23 @@
+basic-mininet-fedora-node can be used to take an already converted
+Rackspace native base image to a basic system with mininet and other
+test tools for use in the OpenDaylight build and testing environment
+
+Please see the rackspace-convert-base vagrant setup for creation of the
+needed base image.
+
+This vagrant expects (by default) a personal Rackspace image named
+
+'Fedora 21 - Vagrant ready'
+
+To spin up and utilize.
+
+$ RSIMAGE='${baseimagename}' vagrant up --provider=rackspace
+
+Will execute this vagrant against a differently named base image
+
+$ RSRESEAL=true vagrant up --provider=rackspace
+
+NOTE: resealing will cause the vagrant to run the resealing operation.
+This operation will intentionally destroy current SSH pubkeys installed
+on the system as well as reset log files and network configurations. You
+have been warned.
diff --git a/vagrant/basic-mininet-fedora-node/Vagrantfile b/vagrant/basic-mininet-fedora-node/Vagrantfile
new file mode 100644 (file)
index 0000000..f9476a8
--- /dev/null
@@ -0,0 +1,62 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby sw=2 ts=2 sts=2 et :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # root off of the rackspace provider dummy box
+  config.vm.box = "dummy"
+
+  # rackspace systems, even with cloud-init
+  # don't seem to have the cloud int user ${osname} (or similar)
+  # getting the ssh key for some reason, root does for sure
+  # so use that
+  config.ssh.username = 'root'
+
+  # Fedora and EL systems default to requiring tty for sudo
+  # This should have been disabled with the Vagrant ready
+  # base box conversion (see rackspace-convert-base vagrant)
+  # but just to be safe
+  config.ssh.pty = true
+
+  # make sure to set the following in your
+  # ~/.vagrant.d/boxes/dummy/0/rackspace/Vagrantfile
+  # rs.username
+  # rs.api_key
+  # rs.rackspace_region
+  #
+  # If you are not using an SSH token / smartcard also set this
+  # rs.key_name
+  # config.ssh.private_key_path -- set this outside the rackspace block
+  #         in your base box
+  config.vm.provider :rackspace do |rs|
+    # create these base builds always on the smallest system possible
+    rs.flavor = 'general1-1'
+
+    # allow for switching to ORD cloud but default to DFW
+    if (ENV['RSREGION'] == 'ord')
+      rs.rackspace_region = :ord
+    else
+      rs.rackspace_region = :dfw
+    end
+
+    # Default the Fedora 21 - Vagrant ready image unless overriden by a RSIMAGE
+    # environment variable
+    if ENV['RSIMAGE']
+      rs.image = ENV['RSIMAGE']
+    else
+      rs.image = 'Fedora 21 - Vagrant ready'
+    end
+  end
+
+  # run our bootstrapping for the ovsdb-devstack system
+  config.vm.provision 'shell', path: 'bootstrap.sh'
+
+  # set RSRESEAL to... anything if you want to snap an image of this box
+  # not setting the environment variable will cause the system to come
+  # up fully and not be in a resealable state
+  if ENV['RSRESEAL']
+    config.vm.provision 'shell', path: 'system_reseal.sh'
+  end
+end
diff --git a/vagrant/basic-mininet-fedora-node/bootstrap.sh b/vagrant/basic-mininet-fedora-node/bootstrap.sh
new file mode 100644 (file)
index 0000000..fcf2458
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# vim: sw=4 ts=4 sts=4 et tw=72 :
+
+# update os
+yum clean all
+yum update -q -y
+
+# install mininet
+git clone git://github.com/mininet/mininet
+cd mininet
+git checkout -b 2.2.1 2.2.1
+cd ..
+mininet/util/install.sh -nf
+
diff --git a/vagrant/basic-mininet-fedora-node/system_reseal.sh b/vagrant/basic-mininet-fedora-node/system_reseal.sh
new file mode 100644 (file)
index 0000000..ba54ce2
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# clean-up from any prior cloud-init networking
+rm -rf /etc/sysconfig/network-scripts/{ifcfg,route}-eth*
+
+rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.pem /etc/Pegasus/*.srl /root/anaconda-ks.cfg /root/anaconda-post.log /root/initial-setup-ks.cfg /root/install.log /root/install.log.syslog /var/cache/fontconfig/* /var/cache/gdm/* /var/cache/man/* /var/lib/AccountService/users/* /var/lib/fprint/* /var/lib/logrotate.status /var/log/*.log* /var/log/BackupPC/LOG /var/log/ConsoleKit/* /var/log/anaconda.syslog /var/log/anaconda/* /var/log/apache2/*_log /var/log/apache2/*_log-* /var/log/apt/* /var/log/aptitude* /var/log/audit/* /var/log/btmp* /var/log/ceph/*.log /var/log/chrony/*.log /var/log/cron* /var/log/cups/*_log /var/log/debug* /var/log/dmesg* /var/log/exim4/* /var/log/faillog* /var/log/gdm/* /var/log/glusterfs/*glusterd.vol.log /var/log/glusterfs/glusterfs.log /var/log/httpd/*log /var/log/installer/* /var/log/jetty/jetty-console.log /var/log/journal/* /var/log/lastlog* /var/log/libvirt/libvirtd.log /var/log/libvirt/lxc/*.log /var/log/libvirt/qemu/*.log /var/log/libvirt/uml/*.log /var/log/lightdm/* /var/log/mail/* /var/log/maillog* /var/log/messages* /var/log/ntp /var/log/ntpstats/* /var/log/ppp/connect-errors /var/log/rhsm/* /var/log/sa/* /var/log/secure* /var/log/setroubleshoot/*.log /var/log/spooler* /var/log/squid/*.log /var/log/syslog* /var/log/tallylog* /var/log/tuned/tuned.log /var/log/wtmp* /var/named/data/named.run
+
+rm -rf ~/.viminfo /etc/ssh/ssh*key*
+
+echo "********************************************"
+echo "*   PLEASE SNAPSHOT IMAGE AT THIS TIME     *"
+echo "********************************************"
index ad4983059ec337b78b997f93ee00340c9cf4f534..6842655e3e4eaaeb0c6c41b1159855cc61b6d651 100644 (file)
@@ -9,7 +9,10 @@ yum install -y -q unzip xz
 # install some needed internal networking configurations
 yum install -y dnsmasq puppet
 
-puppet module install lex-dnsmasq
+# install specific versions of puppet modules
+puppet module install puppetlabs-stdlib -v 4.5.1
+puppet module install puppetlabs-concat -v 1.2.0
+puppet module install lex-dnsmasq -v 2.6.1
 
 # script requires information about subdomain
 if [ -z "$1" ]; then
@@ -34,30 +37,6 @@ chattr +i /etc/resolv.conf
 # don't let cloud-init do funny things to our routing
 chattr +i /etc/sysconfig/network-scripts/route-eth0
 
-# create a docker bridge that doesn't trample our networks
-# but only if docker is installed
-DOCKER=`rpm -q docker-io`
-if [ "$?" == "0" ]; then
-    echo "---> Docker installed, configuring docker bridge"
-    # fully overwrite the default, otherwise we end up with the options
-    # split over two lines which will fail
-    # Default: OPTIONS=--selinux-enabled
-    echo 'OPTIONS=--selinux-enabled --bip=10.250.0.254/24' > /etc/sysconfig/docker
-#    cat <<EOL > /etc/sysconfig/network-scripts/ifcfg-docker0
-#DEVICE="docker0"
-#TYPE="Bridge"
-#ONBOOT="yes"
-#NM_CONTROLLED="no"
-#IPADDR=10.250.0.254
-#NETMASK=255.255.255.0
-#EOL
-
-#    # don't let cloud-init do funny things to our docker bridge
-#    chattr +i /etc/sysconfig/network-scripts/ifcfg-docker0
-    cat /etc/sysconfig/docker
-fi
-
-
 # setup the needed routing
 cat <<EOL >> /etc/rc.d/post-cloud-init
 #!/bin/bash
index 8079d7bc85e06b390b37b72ea60026b7fdbae762..15d47f68cd8bb3005c84358b545ff56bfba54835 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# vim: ts=4 sw=4 sts=4 et :
+# vim: ts=4 sw=4 sts=4 et tw=72 :
 
 # Handle the occurance where SELINUX is actually disabled
 if [ `grep SELINUX=permissive /etc/selinux/config` ]; then
@@ -26,3 +26,36 @@ fi
 
 yum clean all -q
 yum update -y -q
+
+# add in components we need or want on systems
+yum install -y -q @base unzip xz puppet git perl-XML-XPath
+
+# All of our systems require Java (because of Jenkins)
+# Install all versions of the OpenJDK devel but force 1.7.0 to be the
+# default
+
+yum install -y -q 'java-*-openjdk-devel'
+alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
+alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
+
+# To handle the prompt style that is expected all over the environment
+# with how use use robotframework we need to make sure that it is
+# consistent for any of the users that are created during dynamic spin
+# ups
+echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
+
+# Do any Distro specific installations here
+echo "Checking distribution"
+if [ `/usr/bin/facter operatingsystem` = "Fedora" ]; then
+    echo "---> Fedora found"
+    echo "No extra steps for Fedora"
+else
+    if [ `/usr/bin/facter operatingsystemrelease | /bin/cut -d '.' -f1` = "7" ]; then
+        echo "---> CentOS 7"
+        echo "No extra steps currently for CentOS 7"
+    else
+        echo "---> CentOS 6"
+        echo "Installing ODL YUM repo"
+        yum install -q -y https://nexus.opendaylight.org/content/repositories/opendaylight-yum-epel-6-x86_64/rpm/opendaylight-release/0.1.0-1.el6.noarch/opendaylight-release-0.1.0-1.el6.noarch.rpm
+    fi
+fi