Merge "Editing devstack daily job template"

diff --git a/jjb/ovsdb/ovsdb-netvirt-csit-clustering.yaml b/jjb/ovsdb/ovsdb-netvirt-csit-clustering.yaml
new file mode 100644 (file)
index 0000000..7c12bfd
--- /dev/null
+++ b/jjb/ovsdb/ovsdb-netvirt-csit-clustering.yaml
@@ -0,0 +1,36 @@
+- project:
+    name: ovsdb-netvirt-csit-clustering
+    jobs:
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-3node-{functionality}'
+
+    # The project name
+    project: 'ovsdb-netvirt'
+
+    # The functionality under test
+    functionality: 'clustering'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-ovsdb-openstack'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'controller-distribution-{stream},ovsdb-distribution-{stream}'

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
new file mode 100644 (file)
index 0000000..fe8a4cc
--- /dev/null
+++ b/jjb/packaging/packaging.yaml
@@ -0,0 +1,10 @@
+- project:
+    name: packaging
+    jobs:
+        - '{name}-verify-python-{stream}'
+
+    stream:
+        - master:
+            branch: 'master'
+
+    project: 'integration/packaging'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index b17d31045a1580a17e4b8ab84f9b81dccf63d027..4c01325466ea914ac30d633605bdb92474b1eee4 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -24,9 +24,11 @@
     affinity-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414693281960'
     alto-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1420844443276'
     armoury-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1440526158820'
+    atrium-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1459793489131'
     autorelease-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1420845126167'
     bgpcep-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414695308787'
     capwap-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1419261884166'
+    cardinal-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1459790819279'
     centinel-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1440438583607'
     controller-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414691924293'
     coretutorials-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1420844514071'

diff --git a/src/site/markdown/jenkins.md b/src/site/markdown/jenkins.md
index 9a96b27e5acc8911f39de923445b3571609987da..143cb250f75d7c81328e75f8862be0c839c67ca8 100644 (file)
--- a/src/site/markdown/jenkins.md
+++ b/src/site/markdown/jenkins.md
@@ -21,6 +21,9 @@ Sections:
 * [Jenkins Sandbox](#jenkins_sandbox)
     * [Configuration](#sandbox_config)
     * [Manual Method](#jjb_use_manual)
+        * [Test Jobs](#jjb_manual_test)
+        * [Push Jobs](#jjb_manual_push)
+        * [Run Jobs](#jjb_manual_run)
     * [Docker Method](#jjb_use_docker)
 
 # <a name="jenkins_master">Jenkins Master</a>
@@ -784,6 +787,24 @@ can push them to the Jenkins sandbox.
     # Don't push all jobs by omitting the final param! (ctrl+c to abort)
     jenkins-jobs --conf jenkins.ini update jjb/ <job-name>
 
+### <a name="jjb_manual_run">Running Jobs</a>
+
+Once you have your Jenkins job configuration [pushed to the
+Sandbox](#jjb_manual_push) you can trigger it to run.
+
+Find your newly-pushed job on the [Sandbox's web UI][27]. Click on its name to
+see the job's details.
+
+Make sure you're [logged in][32] to the Sandbox.
+
+Click "Build with Parameters" and then "Build".
+
+Wait for your job to be scheduled and run. Click on the job number to see
+details, including console output.
+
+Make changes to your JJB configuration, re-test, re-push and re-run until
+your job is ready.
+
 ## <a name="jjb_use_docker">Docker Method</a>
 
 If [using Docker](#jjb_install_docker):