From: Daniel Farrell Date: Thu, 28 Jun 2018 15:31:01 +0000 (+0000) Subject: Merge "Allow pushing to scratch repos from sandbox" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7238b8b21b58c99536b529c48be3b4532a25d9b7;hp=efaed9419099102b28649ca222215edc58fa18c0;p=releng%2Fbuilder.git Merge "Allow pushing to scratch repos from sandbox" --- diff --git a/jjb/autorelease/validate-autorelease-oxygen.yaml b/jjb/autorelease/validate-autorelease-oxygen.yaml index cc5bdf577..06bad8036 100644 --- a/jjb/autorelease/validate-autorelease-oxygen.yaml +++ b/jjb/autorelease/validate-autorelease-oxygen.yaml @@ -61,6 +61,8 @@ project: p4plugin - packetcable: project: packetcable + - serviceutils: + project: serviceutils - sfc: project: sfc - snmp: diff --git a/jjb/autorelease/view-autorelease-oxygen.yaml b/jjb/autorelease/view-autorelease-oxygen.yaml index 1f79bad88..9138f0ea3 100644 --- a/jjb/autorelease/view-autorelease-oxygen.yaml +++ b/jjb/autorelease/view-autorelease-oxygen.yaml @@ -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' diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 56ab3272c..c4f868330 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -26,8 +26,11 @@ 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 diff --git a/jjb/global-jjb b/jjb/global-jjb index d0dddc7e5..f58aa56ac 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit d0dddc7e5ea93df8e47b90bdf6afd2edfd966cb5 +Subproject commit f58aa56acc44a8eb7498af10e5d229e1690e58b0 diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh index d155edb2e..2b6f7fde7 100644 --- a/jjb/integration/integration-deploy-openstack-run-test.sh +++ b/jjb/integration/integration-deploy-openstack-run-test.sh @@ -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 diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index cfde9c050..13f6115d0 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -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}' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index c17dee868..6e7ecc2ba 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -44,6 +44,22 @@ - 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: diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 4504640e8..fbfb903db 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -47,3 +47,15 @@ - 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} diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml index e6b79cb35..f79f8a552 100644 --- a/jjb/releng-packer-jobs.yaml +++ b/jjb/releng-packer-jobs.yaml @@ -76,6 +76,23 @@ 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: diff --git a/jjb/releng-views.yaml b/jjb/releng-views.yaml index 62c83c0fd..bee471bf5 100644 --- a/jjb/releng-views.yaml +++ b/jjb/releng-views.yaml @@ -586,12 +586,6 @@ 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 index 740850818..000000000 --- a/jjb/spectrometer/spectrometer-jobs.yaml +++ /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