Merge "Allow pushing to scratch repos from sandbox"
authorDaniel Farrell <dfarrell@redhat.com>
Thu, 28 Jun 2018 15:31:01 +0000 (15:31 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 28 Jun 2018 15:31:01 +0000 (15:31 +0000)
jjb/autorelease/validate-autorelease-oxygen.yaml
jjb/autorelease/view-autorelease-oxygen.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/global-jjb
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-test-jobs.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/releng-packer-jobs.yaml
jjb/releng-views.yaml
jjb/spectrometer/spectrometer-jobs.yaml [deleted file]

index cc5bdf577e246a0ad4404d432f411d726f559186..06bad80366063d4328e0d198b5a1513bf415edd4 100644 (file)
@@ -61,6 +61,8 @@
           project: p4plugin
       - packetcable:
           project: packetcable
+      - serviceutils:
+          project: serviceutils
       - sfc:
           project: sfc
       - snmp:
index 1f79bad88b32ba74cd3cfdc1b1c82015c6f695cf..9138f0ea321cf57602d8d0c25f4c1c0de48a6fc1 100644 (file)
@@ -49,6 +49,7 @@
       - 'ovsdb-maven-merge-oxygen'
       - 'p4plugin-maven-merge-oxygen'
       - 'packetcable-maven-merge-oxygen'
+      - 'serviceutils-maven-merge-oxygen'
       - 'sfc-maven-merge-oxygen'
       - 'snmp-maven-merge-oxygen'
       - 'snmp4sdn-maven-merge-oxygen'
index 56ab3272c4899897af5c4c6482a0cf64e987a123..c4f868330e24f67cae0959087db2c755a2ec5ae3 100644 (file)
     tools_system_count: 0
 
     # Features to install
+    # We do not need to explicitly install restconf here (which is not brought in by the clustering-test-app)
+    # because this project will only create the -all- job which will automatically install the compatible with
+    # all feature set. That feature set will bring in restconf, which is required by the CSIT suites. If/When
+    # the -only- version of this job is brought back, we'll need to take that in to consideration.
     install-features: >
-        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Robot custom options
index d0dddc7e5ea93df8e47b90bdf6afd2edfd966cb5..f58aa56acc44a8eb7498af10e5d229e1690e58b0 160000 (submodule)
@@ -1 +1 @@
-Subproject commit d0dddc7e5ea93df8e47b90bdf6afd2edfd966cb5
+Subproject commit f58aa56acc44a8eb7498af10e5d229e1690e58b0
index d155edb2ea54ee7f3fb480775310aead7fc5a3e8..2b6f7fde741071053a94a1f3508835e04973331f 100644 (file)
@@ -11,6 +11,9 @@ SSH="ssh -t -t"
 ADMIN_PASSWORD="admin"
 OPENSTACK_MASTER_CLIENTS_VERSION="queens"
 
+pip install odltools
+odltools -V
+
 # TODO: remove this work to run changes.py if/when it's moved higher up to be visible at the Robot level
 printf "\nshowing recent changes that made it into the distribution used by this job:\n"
 $PYTHON -m pip install --upgrade urllib3
index cfde9c0501a6f10d58bd92170efda939b0313e7a..13f6115d0a2941bb7733513d72fe4a1438b6747d 100644 (file)
@@ -50,7 +50,7 @@
           csit-blacklist: >
               alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
               l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
-              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd wip
+              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd tempest wip
           csit-list: !include: csit-jobs-fluorine.lst
           csit-weekly-list: '{csit-weekly-list-fluorine}'
           csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
@@ -58,7 +58,7 @@
           branch: 'stable/oxygen'
           csit-blacklist: >
               capwap centinel didm iotdm jsonrpc lacp messaging4transport netide nic
-              ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd wip
+              ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd tempest wip
           csit-list: !include: csit-jobs-oxygen.lst
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
index c17dee868ab736cc2186fac4250e93ee1c4fa262..6e7ecc2baa547ff2e4920902f96eb4f52eed1264 100644 (file)
       - gate-tdd-wip:
           testplan: '{project}-{topology}-tdd-wip-openstack.txt'
           schedule: ''
+      - tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          schedule: '{schedule-daily}'
+      - tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+      - gate-tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+      - gate-tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
 
     openstack:
       - pike:
index 4504640e80fe656a2465782269fa5e5782a353c0..fbfb903dbe6b8582701b5437b7546fe4a55d467a 100644 (file)
       - upgrade:
           csit-list: >
               netvirt-csit-1node-openstack-{os-branch}-upgrade-{stream}
+      - tempest:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-tempest-stateful-{stream}
+      - cluster-tempest:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-tempest-stateful-{stream}
+      - tempest-snat-conntrack:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}
+      - cluster-tempest-snat-conntrack:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}
index e6b79cb35df4ecc45a8d674051b5acee4ebe774a..f79f8a5520a1ec101c26dc84aec34478fb287dd8 100644 (file)
     templates: devstack-pre-pip-pike
     platforms: centos-7
 
+- project:
+    name: packer-devstack-pre-pip-queens-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+    build-timeout: 75
+    cron: '00 H 1 * *'
+
+    templates: devstack-pre-pip-queens
+    platforms: centos-7
+
 - project:
     name: packer-docker-jobs
     jobs:
index 62c83c0fd4742307ae23cf2290866f7f61ea194b..bee471bf56a7481e4a567b0468156ed77fddb259 100644 (file)
     regex: '^snmp4sdn-.*'
     <<: *releng_view_common
 
-- view:
-    name: spectrometer
-    description: 'List of spectrometer jobs'
-    regex: '^spectrometer-.*'
-    <<: *releng_view_common
-
 - view:
     name: sxp
     description: 'List of sxp jobs'
diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
deleted file mode 100644 (file)
index 7408508..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
----
-- project:
-    name: spectrometer
-    jobs:
-      - '{project-name}-node-jobs'
-      - '{project-name}-python-jobs'
-      - '{project-name}-rtd-jobs':
-          project-pattern: spectrometer
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-spectrometer/32925/
-          rtd-token: 383146c345ca41b9e36859b6dcd57ffca38f21c7
-      - spectrometer-deploy-webapp-master
-
-    stream:
-      - master:
-          branch: 'master'
-
-    project: spectrometer
-    project-name: spectrometer
-    tox-dir: server
-    node-dir: web
-    node-version: 6.11.4
-    staging-server: spectrometer03.dfw.opendaylight.org
-
-- job-template:
-    name: 'spectrometer-deploy-webapp-master'
-
-    project-type: freestyle
-    node: centos7-builder-2c-8g
-    concurrent: false
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    wrappers:
-      - build-timeout
-      - ssh-agent-credentials:
-          users:
-            - 'spectrometer-deploy-key'
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          gerrit-server-name: '{gerrit-server-name}'
-          name: 'spectrometer'
-          branch: 'master'
-      - timed: '@daily'
-
-    builders:
-      - shell: |
-          echo "Deploying spectrometer"
-          ssh -oStrictHostKeyChecking=no spectrometer@{staging-server} 'bash -s' << EOF
-
-          if [ -e spectrometer ]; then
-              cd spectrometer
-              git pull
-              cd ..
-          else
-              git clone https://git.opendaylight.org/gerrit/spectrometer
-          fi
-
-          echo "---> Setup Python"
-          if [ -e venv-python34/bin/activate ]; then
-              echo "---> Updating Python dependencies"
-              source venv-python34/bin/activate
-              PYTHON="venv-python34/bin/python"
-          else
-              echo "---> virtualenv not found. Setting up new virtualenv."
-              pyvenv venv-python34 --without-pip
-              source venv-python34/bin/activate
-              PYTHON="venv-python34/bin/python"
-              wget https://bootstrap.pypa.io/get-pip.py
-              python get-pip.py
-              $PYTHON -m pip install -e spectrometer/server
-          fi
-          $PYTHON -m pip install --upgrade -r spectrometer/server/requirements.txt
-          $PYTHON -m pip install --upgrade gunicorn gevent
-          $PYTHON -m pip install --upgrade nodeenv
-          $PYTHON -m pip install --upgrade pipdeptree
-          pipdeptree
-
-          echo "---> Setup NodeJS"
-          if [ -e venv-nodejs/bin/activate ]; then
-              echo "---> Updating NodeJS dependencies"
-          else
-              echo "---> nodeenv not found. Setting up new nodeenv"
-              nodeenv --node={node-version} --prebuilt venv-nodejs
-          fi
-          source venv-nodejs/bin/activate
-          node -v
-          npm -v
-
-          echo "---> Restart spectrometer-api"
-          pkill gunicorn
-          sleep 5  # Sleep 5 seconds for cooldown
-          spectrometer server sync
-          nohup gunicorn -b 0.0.0.0:5000 'spectrometer:run_app()' --timeout 600 -k gevent >> ~/gunicorn.out &
-          sleep 120  # Sleep 2 minutes to allow Spectrometer to initialize
-
-          echo "---> Restart spectrometer-web"
-          pkill node
-          sleep 5  # Sleep 5 seconds for cooldown
-          cd spectrometer/web
-          npm install
-          nohup npm start >> ~/node.out &
-
-          EOF