Merge "Migrate aaa to global-jjb Maven jobs"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 1b6a77c5cbe6d1fc0855ebd2ee818175b0121b7f..2851d0e2ac60184466ec2dafa7b040e0a8c9d98a 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -44,6 +44,7 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - java-builder - 20170807-2145
 * CentOS 7 - java-builder - 20171014-2148
 * CentOS 7 - java-builder - 20171020-0130
+* CentOS 7 - java-builder - 20171030-1039
 * CentOS 7 - robot - 20170117-0004
 * CentOS 7 - robot - 20170210-1803
 * CentOS 7 - robot - 20170328-0206

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 1a4b42b91e5f0818a7df2d8e6a759896ef4cfffa..ba6c34e3c015b7d0e6157afc22f407e6dd3d3a68 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -2,12 +2,10 @@
 - project:
     name: daexim-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     project: 'daexim'
     project-name: 'daexim'
@@ -25,14 +23,16 @@
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e4dade34bd7
+
 - project:
     name: daexim-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'daexim'
     project-name: 'daexim'
@@ -50,6 +50,9 @@
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e4dade34bd7
+
 - project:
     name: daexim-sonar
     jobs:

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index d080873aac58feec86af8e52083be3f3ae5d2c48..14096267a27ddebe1a4ea074a02c00320ce1047b 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -2,12 +2,10 @@
 - project:
     name: eman-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'eman'
@@ -25,14 +23,16 @@
     email-upstream: '[eman]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
 - project:
     name: eman-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'eman'
@@ -50,14 +50,16 @@
     email-upstream: '[eman]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
 - project:
     name: eman-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'eman'
@@ -76,6 +78,9 @@
     email-upstream: '[eman]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
 - project:
     name: eman-sonar
     jobs:

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 94c94c44d412a44bf447c4f9496099300d63eaa2..6a1b642338100b2b89ecf7933e1608ee8086e79c 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -143,7 +143,6 @@ USE_SCREEN=True
 SCREEN_LOGDIR=/opt/stack/data/log
 LOG_COLOR=False
 RECLONE=${RECLONE}
-CELLSV2_SETUP=singleconductor
 
 disable_all_services
 EOF
@@ -288,7 +287,6 @@ LOG_COLOR=False
 USE_SCREEN=True
 SCREEN_LOGDIR=/opt/stack/data/log
 RECLONE=${RECLONE}
-CELLSV2_SETUP=singleconductor
 
 disable_all_services
 EOF
@@ -529,16 +527,17 @@ EOF
         scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
         scp ${!OSIP}:/opt/stack/tempest/etc/tempest.conf ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
-        scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
-        scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
         scp ${!OSIP}:/var/log/httpd/keystone_access.log ${NODE_FOLDER}
         scp ${!OSIP}:/var/log/httpd/keystone.log ${NODE_FOLDER}
+        scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
+        scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
         list_files "${!OSIP}" "${NODE_FOLDER}"
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/usr/lib/systemd/system/haproxy.service ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/dmesg.log ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/rabbitmq ${NODE_FOLDER}
         rsync -avhe ssh ${!OSIP}:/opt/stack/logs/* ${NODE_FOLDER} # rsync to prevent copying of symbolic links
         scp extra_debug.sh ${!OSIP}:/tmp
         ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
@@ -820,11 +819,14 @@ done
 # compute exits and does not attempt to restart.
 # 180s is chosen because in test runs the control node usually finished in 17-20 minutes and the computes finished
 # in 17 minutes, so take the max difference of 3 minutes and the jobs should still finish around the same time.
-# This is the error seen in the compute n-cpu.log:
+# one of the following errors is seen in the compute n-cpu.log:
 # Unhandled error: NotAllowed: Connection.open: (530) NOT_ALLOWED - access to vhost 'nova_cell1' refused for user 'stackrabbit'
-# Compare that to this log in the control stack.log: sudo rabbitmqctl set_permissions -p nova_cell1 stackrabbit
-# echo "Sleeping for 180s to allow controller to create nova_cell1 before the computes need it"
-# sleep 180
+# AccessRefused: (0, 0): (403) ACCESS_REFUSED - Login was refused using authentication mechanism AMQPLAIN. For details see the broker logfile.
+# Compare that timestamp to this log in the control stack.log: sudo rabbitmqctl set_permissions -p nova_cell1 stackrabbit
+# If the n-cpu.log is earlier than the control stack.log timestamp then the failure condition is likely hit.
+# TODO: modify devstack to wait for rabbitmq to be available on the controller before starting nova-compute.
+echo "Sleeping for 360s to allow controller to create nova_cell1 before the computes need it"
+sleep 360
 
 for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
     NUM_COMPUTES_PER_SITE=$((NUM_OPENSTACK_COMPUTE_NODES / NUM_OPENSTACK_SITES))

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 206efa4af2d835d6d4ebba1cde050440d2a78f07..87d4d3337235ac550809965fea8935d243a3f1b6 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -2,10 +2,9 @@
 - project:
     name: jsonrpc-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -23,13 +22,15 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -47,13 +48,15 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -72,6 +75,9 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-sonar
     jobs: