From: Jamo Luhrsen Date: Tue, 20 Oct 2015 21:39:49 +0000 (-0700) Subject: updating openstack+odl tempest tests job X-Git-Tag: release/beryllium~443^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=835081abb270b910cea14c959414b02861fd4de3;p=releng%2Fbuilder.git updating openstack+odl tempest tests job Change-Id: I1a5fc1a302a644a218a9846e7190c5237d39ecc9 Signed-off-by: Jamo Luhrsen --- diff --git a/jjb/neutron/include-raw-openstack-ci.sh b/jjb/neutron/include-raw-openstack-ci.sh index a1dff8913..24afa0cb3 100644 --- a/jjb/neutron/include-raw-openstack-ci.sh +++ b/jjb/neutron/include-raw-openstack-ci.sh @@ -104,14 +104,14 @@ fi # Because we are testing a non standard project, add # our project repository. This makes zuul do the right # reference magic for testing changes. -export PROJECTS="stackforge/networking-odl $PROJECTS" +export PROJECTS="openstack/networking-odl $PROJECTS" # Note the actual url here is somewhat irrelevant because it # caches in nodepool, however make it a valid url for # documentation purposes. -if [ "$GERRIT_PROJECT" == "stackforge/networking-odl" ]; then +if [ "$GERRIT_PROJECT" == "openstack/networking-odl" ]; then export DEVSTACK_LOCAL_CONFIG+="enable_plugin networking-odl https://$GERRIT_HOST/$GERRIT_PROJECT $GERRIT_REFSPEC" else - export DEVSTACK_LOCAL_CONFIG+="enable_plugin networking-odl https://git.openstack.org/stackforge/networking-odl" + export DEVSTACK_LOCAL_CONFIG+="enable_plugin networking-odl https://git.openstack.org/openstack/networking-odl" fi diff --git a/jjb/ovsdb/include-raw-openstack-ci.sh b/jjb/ovsdb/include-raw-openstack-ci.sh index 1b4277baa..feabea0b2 100644 --- a/jjb/ovsdb/include-raw-openstack-ci.sh +++ b/jjb/ovsdb/include-raw-openstack-ci.sh @@ -16,13 +16,13 @@ sudo mkdir -p /opt/stack/new sudo chown -R jenkins:jenkins /opt/stack/new sudo bash -c 'echo "stack ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers' -# We need to install some scripts from openstack-infra/project-config +# We need to install some scripts from openstack/os-testr project cd ~ echo "Setting up infra scripts" sudo mkdir -p /usr/local/jenkins/slave_scripts -git clone https://git.openstack.org/openstack-infra/project-config -cd project-config -sudo cp jenkins/scripts/subunit2html.py /usr/local/jenkins/slave_scripts +git clone https://github.com/openstack/os-testr.git +cd os-testr/os_testr +sudo cp subunit2html.py /usr/local/jenkins/slave_scripts # Save existing WORKSPACE SAVED_WORKSPACE=$WORKSPACE @@ -81,8 +81,10 @@ fi ## export ODL_BOOT_WAIT=30 # Use specific build, if asked to do so -if [ "${ODL_VERSION}" == "lithium-latest" ] ; then - DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=lithium-snapshot;" +if [ "${ODL_VERSION}" == "beryllium" ] ; then + DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=beryllium-snapshot-0.4.0;" +elif [ "${ODL_VERSION}" == "lithium" ] ; then + DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=lithium-snapshot-0.3.1;" elif [ "${ODL_VERSION}" == "helium" ] ; then DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=helium;" fi @@ -99,14 +101,14 @@ fi # Because we are testing a non standard project, add # our project repository. This makes zuul do the right # reference magic for testing changes. -export PROJECTS="stackforge/networking-odl $PROJECTS" +export PROJECTS="openstack/networking-odl $PROJECTS" # Note the actual url here is somewhat irrelevant because it # caches in nodepool, however make it a valid url for # documentation purposes. -if [ "$GERRIT_PROJECT" == "stackforge/networking-odl" ]; then +if [ "$GERRIT_PROJECT" == "openstack/networking-odl" ]; then export DEVSTACK_LOCAL_CONFIG+="enable_plugin networking-odl https://$GERRIT_HOST/$GERRIT_PROJECT $GERRIT_REFSPEC" else - export DEVSTACK_LOCAL_CONFIG+="enable_plugin networking-odl https://git.openstack.org/stackforge/networking-odl" + export DEVSTACK_LOCAL_CONFIG+="enable_plugin networking-odl https://git.openstack.org/openstack/networking-odl" fi @@ -133,9 +135,11 @@ DGRET=$? OS_WORKSPACE=$WORKSPACE export WORKSPACE=$SAVED_WORKSPACE -# Copy all the logs +# Copy and display all the logs +cat /opt/stack/new/devstacklog* +ls /opt/stack/; ls /opt/stack/new; ls /opt/stack/new/opendaylight; cp -r $OS_WORKSPACE/logs $WORKSPACE -cp -a /opt/stack/new/logs/q-odl-karaf* $WORKSPACE/logs +cp -a /opt/stack/new/logs/screen-odl-karaf* $WORKSPACE/logs mkdir -p $WORKSPACE/logs/opendaylight cp -a /opt/stack/new/opendaylight/distribution*/etc $WORKSPACE/logs/opendaylight # Unzip the logs to make them easier to view diff --git a/jjb/ovsdb/ovsdb-daily-openstack-beryllium.yaml b/jjb/ovsdb/ovsdb-daily-openstack-beryllium.yaml index 7d3f2cd22..30af62028 100644 --- a/jjb/ovsdb/ovsdb-daily-openstack-beryllium.yaml +++ b/jjb/ovsdb/ovsdb-daily-openstack-beryllium.yaml @@ -4,6 +4,7 @@ - 'ovsdb-daily-openstack-beryllium' project: 'ovsdb' + odl_version: beryllium - job-template: name: 'ovsdb-daily-openstack-beryllium' @@ -19,6 +20,8 @@ parameters: - project-parameter: project: '{project}' + - controller-version-parameter: + odl_version: '{odl_version}' wrappers: - timeout: @@ -38,7 +41,7 @@ builders: - inject: properties-content: | - ODL_VERSION=lithium-latest + ODL_VERSION='{odl_version}' TEMPEST_REGEX=tempest.api.network - shell: !include-raw-escape include-raw-openstack-ci.sh diff --git a/jjb/ovsdb/ovsdb-openstack.yaml b/jjb/ovsdb/ovsdb-openstack.yaml index b381f1451..2c2941862 100644 --- a/jjb/ovsdb/ovsdb-openstack.yaml +++ b/jjb/ovsdb/ovsdb-openstack.yaml @@ -57,7 +57,7 @@ - compare-type: 'ANT' pattern: 'neutron/db/**' - project-compare-type: 'ANT' - project-pattern: 'stackforge/networking-odl' + project-pattern: 'openstack/networking-odl' branches: - branch-compare-type: 'ANT' branch-pattern: 'master' diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 401944a85..11f02f15d 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -32,6 +32,14 @@ default: '{refspec}' description: "GERRIT_REFSPEC parameter if not given by trigger" +- parameter: + name: controller-version-parameter + parameters: + - string: + name: ODL_VERSION + default: '{odl_version}' + description: 'Controller version (for use with openstacks networking_odl project)' + - scm: name: git-scm scm: