@@ -42,9 +42,9 @@ QUANTUM_BRANCH=master

 QUANTUM_CLIENT_REPO=https://github.com/openstack/python-quantumclient

 QUANTUM_CLIENT_BRANCH=master

-# CI test suite

-CITEST_REPO=https://github.com/openstack/tempest.git

-CITEST_BRANCH=master

+# Tempest test suite

+TEMPEST_REPO=https://github.com/openstack/tempest.git

+TEMPEST_BRANCH=master

 # Specify a comma-separated list of uec images to download and install into glance.

 # supported urls here are:

deleted file mode 100755

@@ -1,262 +0,0 @@

-#!/usr/bin/env bash

-#

-# build_ci_config.sh - Build a config.ini for tempest (openstack-integration-tests)

-#                      (https://github.com/openstack/tempest.git)

-

-function usage {

-    echo "$0 - Build config.ini for tempest"

-    echo ""

-    echo "Usage: $0 [configdir]"

-    exit 1

-}

-

-if [ "$1" = "-h" ]; then

-    usage

-fi

-

-# Clean up any resources that may be in use

-cleanup() {

-    set +o errexit

-

-    # Mop up temporary files

-    if [ -n "$CONFIG_CONF_TMP" -a -e "$CONFIG_CONF_TMP" ]; then

-        rm -f $CONFIG_CONF_TMP

-    fi

-    if [ -n "$CONFIG_INI_TMP" -a -e "$CONFIG_INI_TMP" ]; then

-        rm -f $CONFIG_INI_TMP

-    fi

-

-    # Kill ourselves to signal any calling process

-    trap 2; kill -2 $$

-}

-

-trap cleanup SIGHUP SIGINT SIGTERM SIGQUIT EXIT

-

-# Keep track of the current directory

-TOOLS_DIR=$(cd $(dirname "$0") && pwd)

-TOP_DIR=`cd $TOOLS_DIR/..; pwd`

-

-# Abort if localrc is not set

-if [ ! -e $TOP_DIR/localrc ]; then

-    echo "You must have a localrc with ALL necessary passwords and configuration defined before proceeding."

-    echo "See stack.sh for required passwords."

-    exit 1

-fi

-

-# Source params

-source ./stackrc

-

-# Where Openstack code lives

-DEST=${DEST:-/opt/stack}

-

-CITEST_DIR=$DEST/tempest

-

-CONFIG_DIR=${1:-$CITEST_DIR/etc}

-CONFIG_CONF=$CONFIG_DIR/storm.conf

-CONFIG_INI=$CONFIG_DIR/config.ini

-

-DIST_NAME=${DIST_NAME:-oneiric}

-

-# git clone only if directory doesn't exist already.  Since ``DEST`` might not

-# be owned by the installation user, we create the directory and change the

-# ownership to the proper user.

-function git_clone {

-

-    GIT_REMOTE=$1

-    GIT_DEST=$2

-    GIT_BRANCH=$3

-

-    # do a full clone only if the directory doesn't exist

-    if [ ! -d $GIT_DEST ]; then

-        git clone $GIT_REMOTE $GIT_DEST

-        cd $2

-        # This checkout syntax works for both branches and tags

-        git checkout $GIT_BRANCH

-    elif [[ "$RECLONE" == "yes" ]]; then

-        # if it does exist then simulate what clone does if asked to RECLONE

-        cd $GIT_DEST

-        # set the url to pull from and fetch

-        git remote set-url origin $GIT_REMOTE

-        git fetch origin

-        # remove the existing ignored files (like pyc) as they cause breakage

-        # (due to the py files having older timestamps than our pyc, so python

-        # thinks the pyc files are correct using them)

-        find $GIT_DEST -name '*.pyc' -delete

-        git checkout -f origin/$GIT_BRANCH

-        # a local branch might not exist

-        git branch -D $GIT_BRANCH || true

-        git checkout -b $GIT_BRANCH

-    fi

-}

-

-# Install tests and prerequisites

-sudo PIP_DOWNLOAD_CACHE=/var/cache/pip pip install --use-mirrors `cat $TOP_DIR/files/pips/tempest`

-

-git_clone $CITEST_REPO $CITEST_DIR $CITEST_BRANCH

-

-if [ ! -f $DEST/.ramdisk ]; then

-    # Process network configuration vars

-    GUEST_NETWORK=${GUEST_NETWORK:-1}

-    GUEST_RECREATE_NET=${GUEST_RECREATE_NET:-yes}

-

-    GUEST_IP=${GUEST_IP:-192.168.$GUEST_NETWORK.50}

-    GUEST_CIDR=${GUEST_CIDR:-$GUEST_IP/24}

-    GUEST_NETMASK=${GUEST_NETMASK:-255.255.255.0}

-    GUEST_GATEWAY=${GUEST_GATEWAY:-192.168.$GUEST_NETWORK.1}

-    GUEST_MAC=${GUEST_MAC:-"02:16:3e:07:69:`printf '%02X' $GUEST_NETWORK`"}

-    GUEST_RAM=${GUEST_RAM:-1524288}

-    GUEST_CORES=${GUEST_CORES:-1}

-fi

-

-# Use the GUEST_IP unless an explicit IP is set by ``HOST_IP``

-HOST_IP=${HOST_IP:-$GUEST_IP}

-# Use the first IP if HOST_IP still is not set

-if [ ! -n "$HOST_IP" ]; then

-    HOST_IP=`LC_ALL=C /sbin/ifconfig  | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`

-fi

-

-RABBIT_HOST=${RABBIT_HOST:-localhost}

-

-# Glance connection info.  Note the port must be specified.

-GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$HOST_IP:9292}

-set `echo $GLANCE_HOSTPORT | tr ':' ' '`

-GLANCE_HOST=$1

-GLANCE_PORT=$2

-

-# Set up downloaded images

-# Defaults to use first image

-

-IMAGE_DIR=""

-for imagedir in $TOP_DIR/files/images/*; do

-    KERNEL=""

-    RAMDISK=""

-    IMAGE=""

-    IMAGE_RAMDISK=""

-    KERNEL=$(for f in "$imagedir/"*-vmlinuz*; do

-        [ -f "$f" ] && echo "$f" && break; done; true)

-    [ -n "$KERNEL" ] && ln -sf $KERNEL $imagedir/kernel

-    RAMDISK=$(for f in "$imagedir/"*-initrd*; do

-        [ -f "$f" ] && echo "$f" && break; done; true)

-    [ -n "$RAMDISK" ] && ln -sf $RAMDISK $imagedir/ramdisk && \

-                         IMAGE_RAMDISK="ari_location = $imagedir/ramdisk"

-    IMAGE=$(for f in "$imagedir/"*.img; do

-        [ -f "$f" ] && echo "$f" && break; done; true)

-    if [ -n "$IMAGE" ]; then

-        ln -sf $IMAGE $imagedir/disk

-        # Save the first image directory that contains a disk image link

-        if [ -z "$IMAGE_DIR" ]; then

-            IMAGE_DIR=$imagedir

-        fi

-    fi

-done

-

-# Create storm.conf

-

-CONFIG_CONF_TMP=$(mktemp $CONFIG_CONF.XXXXXX)

-    cat >$CONFIG_CONF_TMP <<EOF

-[nova]

-auth_url=http://$HOST_IP:5000/v2.0/tokens

-user=admin

-api_key=$ADMIN_PASSWORD

-tenant_name=admin

-ssh_timeout=300

-build_interval=10

-build_timeout=600

-

-[environment]

-image_ref=3

-image_ref_alt=4

-flavor_ref=1

-flavor_ref_alt=2

-create_image_enabled=true

-resize_available=true

-authentication=keystone_v2

-EOF

-mv $CONFIG_CONF_TMP $CONFIG_CONF

-CONFIG_CONF_TMP=""

-

-# Create config.ini

-

-CONFIG_INI_TMP=$(mktemp $CONFIG_INI.XXXXXX)

-if [ "$UPLOAD_LEGACY_TTY" ]; then

-    cat >$CONFIG_INI_TMP <<EOF

-[environment]

-aki_location = $TOP_DIR/files/images/aki-tty/image

-ari_location = $TOP_DIR/files/images/ari-tty/image

-ami_location = $TOP_DIR/files/images/ami-tty/image

-image_ref = 3

-image_ref_alt = 3

-flavor_ref = 1

-flavor_ref_alt = 2

-

-[glance]

-host = $GLANCE_HOST

-apiver = v1

-port = $GLANCE_PORT

-image_id = 3

-image_id_alt = 3

-tenant_id = 1

-EOF

-else

-    cat >$CONFIG_INI_TMP <<EOF

-[environment]

-aki_location = $IMAGE_DIR/kernel

-ami_location = $IMAGE_DIR/disk

-$IMAGE_RAMDISK

-image_ref = 2

-image_ref_alt = 2

-flavor_ref = 1

-flavor_ref_alt = 2

-

-[glance]

-host = $GLANCE_HOST

-apiver = v1

-port = $GLANCE_PORT

-image_id = 2

-image_id_alt = 2

-tenant_id = 1

-EOF

-fi

-

-cat >>$CONFIG_INI_TMP <<EOF

-

-[keystone]

-service_host = $HOST_IP

-service_port = 5000

-apiver = v2.0

-user = admin

-password = $ADMIN_PASSWORD

-tenant_name = admin

-

-[nova]

-host = $HOST_IP

-port = 8774

-apiver = v1.1

-project = admin

-user = admin

-key = $ADMIN_PASSWORD

-ssh_timeout = 300

-build_timeout = 300

-flavor_ref = 1

-flavor_ref_alt = 2

-multi_node = no

-

-[rabbitmq]

-host = $RABBIT_HOST

-user = guest

-password = $RABBIT_PASSWORD

-

-[swift]

-auth_host = $HOST_IP

-auth_port = 443

-auth_prefix = /auth/

-auth_ssl = yes

-account = system

-username = root

-password = password

-

-EOF

-mv $CONFIG_INI_TMP $CONFIG_INI

-CONFIG_INI_TMP=""

-

-trap - SIGHUP SIGINT SIGTERM SIGQUIT EXIT

new file mode 100755

@@ -0,0 +1,85 @@

+#!/usr/bin/env bash

+#

+# build_tempest.sh - Checkout and prepare a Tempest repo

+#                    (https://github.com/openstack/tempest.git)

+

+function usage {

+    echo "$0 - Check out and prepare a Tempest repo"

+    echo ""

+    echo "Usage: $0"

+    exit 1

+}

+

+if [ "$1" = "-h" ]; then

+    usage

+fi

+

+# Clean up any resources that may be in use

+cleanup() {

+    set +o errexit

+

+    # Kill ourselves to signal any calling process

+    trap 2; kill -2 $$

+}

+

+trap cleanup SIGHUP SIGINT SIGTERM SIGQUIT EXIT

+

+# Keep track of the current directory

+TOOLS_DIR=$(cd $(dirname "$0") && pwd)

+TOP_DIR=`cd $TOOLS_DIR/..; pwd`

+

+# Abort if localrc is not set

+if [ ! -e $TOP_DIR/localrc ]; then

+    echo "You must have a localrc with ALL necessary passwords and configuration defined before proceeding."

+    echo "See stack.sh for required passwords."

+    exit 1

+fi

+

+# Source params

+source ./stackrc

+

+# Where Openstack code lives

+DEST=${DEST:-/opt/stack}

+

+TEMPEST_DIR=$DEST/tempest

+

+DIST_NAME=${DIST_NAME:-oneiric}

+

+# git clone only if directory doesn't exist already.  Since ``DEST`` might not

+# be owned by the installation user, we create the directory and change the

+# ownership to the proper user.

+function git_clone {

+

+    GIT_REMOTE=$1

+    GIT_DEST=$2

+    GIT_BRANCH=$3

+

+    # do a full clone only if the directory doesn't exist

+    if [ ! -d $GIT_DEST ]; then

+        git clone $GIT_REMOTE $GIT_DEST

+        cd $2

+        # This checkout syntax works for both branches and tags

+        git checkout $GIT_BRANCH

+    elif [[ "$RECLONE" == "yes" ]]; then

+        # if it does exist then simulate what clone does if asked to RECLONE

+        cd $GIT_DEST

+        # set the url to pull from and fetch

+        git remote set-url origin $GIT_REMOTE

+        git fetch origin

+        # remove the existing ignored files (like pyc) as they cause breakage

+        # (due to the py files having older timestamps than our pyc, so python

+        # thinks the pyc files are correct using them)

+        find $GIT_DEST -name '*.pyc' -delete

+        git checkout -f origin/$GIT_BRANCH

+        # a local branch might not exist

+        git branch -D $GIT_BRANCH || true

+        git checkout -b $GIT_BRANCH

+    fi

+}

+

+# Install tests and prerequisites

+sudo PIP_DOWNLOAD_CACHE=/var/cache/pip pip install --use-mirrors `cat $TOP_DIR/files/pips/tempest`

+

+git_clone $TEMPEST_REPO $TEMPEST_DIR $TEMPEST_BRANCH

+

+trap - SIGHUP SIGINT SIGTERM SIGQUIT EXIT

@@ -149,7 +149,7 @@ git_clone $NOVNC_REPO $DEST/novnc $NOVNC_BRANCH

 git_clone $HORIZON_REPO $DEST/horizon $HORIZON_BRANCH

 git_clone $NOVACLIENT_REPO $DEST/python-novaclient $NOVACLIENT_BRANCH

 git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH

-git_clone $CITEST_REPO $DEST/tempest $CITEST_BRANCH

+git_clone $TEMPEST_REPO $DEST/tempest $TEMPEST_BRANCH

 # Use this version of devstack

 rm -rf $MNT_DIR/$DEST/devstack

new file mode 100755

@@ -0,0 +1,227 @@

+#!/usr/bin/env bash

+#

+# configure_tempest.sh - Build a tempest configuration file from devstack

+

+function usage {

+    echo "$0 - Build tempest.conf"

+    echo ""

+    echo "Usage: $0 [configdir]"

+    exit 1

+}

+

+if [ "$1" = "-h" ]; then

+    usage

+fi

+

+# Clean up any resources that may be in use

+cleanup() {

+    set +o errexit

+

+    # Mop up temporary files

+    if [ -n "$CONFIG_INI_TMP" -a -e "$CONFIG_INI_TMP" ]; then

+        rm -f $CONFIG_INI_TMP

+    fi

+

+    # Kill ourselves to signal any calling process

+    trap 2; kill -2 $$

+}

+

+trap cleanup SIGHUP SIGINT SIGTERM SIGQUIT EXIT

+

+# Keep track of the current directory

+TOOLS_DIR=$(cd $(dirname "$0") && pwd)

+TOP_DIR=`cd $TOOLS_DIR/..; pwd`

+

+# Abort if localrc is not set

+if [ ! -e $TOP_DIR/localrc ]; then

+    echo "You must have a localrc with ALL necessary passwords and configuration defined before proceeding."

+    echo "See stack.sh for required passwords."

+    exit 1

+fi

+

+# Source params

+source ./stackrc

+

+# Set defaults not configured by stackrc

+TENANT=${TENANT:-admin}

+USERNAME=${USERNAME:-admin}

+IDENTITY_HOST=${IDENTITY_HOST:-$HOST_IP}

+IDENTITY_PORT=${IDENTITY_PORT:-5000}

+IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-2.0}

+

+# Where Openstack code lives

+DEST=${DEST:-/opt/stack}

+

+TEMPEST_DIR=$DEST/tempest

+

+CONFIG_DIR=${1:-$TEMPEST_DIR/etc}

+CONFIG_INI=$CONFIG_DIR/config.ini

+TEMPEST_CONF=$CONFIG_DIR/tempest.conf

+

+if [ ! -f $DEST/.ramdisk ]; then

+    # Process network configuration vars

+    GUEST_NETWORK=${GUEST_NETWORK:-1}

+    GUEST_RECREATE_NET=${GUEST_RECREATE_NET:-yes}

+

+    GUEST_IP=${GUEST_IP:-192.168.$GUEST_NETWORK.50}

+    GUEST_CIDR=${GUEST_CIDR:-$GUEST_IP/24}

+    GUEST_NETMASK=${GUEST_NETMASK:-255.255.255.0}

+    GUEST_GATEWAY=${GUEST_GATEWAY:-192.168.$GUEST_NETWORK.1}

+    GUEST_MAC=${GUEST_MAC:-"02:16:3e:07:69:`printf '%02X' $GUEST_NETWORK`"}

+    GUEST_RAM=${GUEST_RAM:-1524288}

+    GUEST_CORES=${GUEST_CORES:-1}

+fi

+

+# Use the GUEST_IP unless an explicit IP is set by ``HOST_IP``

+HOST_IP=${HOST_IP:-$GUEST_IP}

+# Use the first IP if HOST_IP still is not set

+if [ ! -n "$HOST_IP" ]; then

+    HOST_IP=`LC_ALL=C /sbin/ifconfig  | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`

+fi

+

+RABBIT_HOST=${RABBIT_HOST:-localhost}

+

+# Glance connection info.  Note the port must be specified.

+GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$HOST_IP:9292}

+set `echo $GLANCE_HOSTPORT | tr ':' ' '`

+GLANCE_HOST=$1

+GLANCE_PORT=$2

+

+# Set up downloaded images

+# Defaults to use first image

+

+IMAGE_DIR=""

+IMAGE_NAME=""

+for imagedir in $TOP_DIR/files/images/*; do

+    KERNEL=""

+    RAMDISK=""

+    IMAGE=""

+    IMAGE_RAMDISK=""

+    KERNEL=$(for f in "$imagedir/"*-vmlinuz*; do

+        [ -f "$f" ] && echo "$f" && break; done; true)

+    [ -n "$KERNEL" ] && ln -sf $KERNEL $imagedir/kernel

+    RAMDISK=$(for f in "$imagedir/"*-initrd*; do

+        [ -f "$f" ] && echo "$f" && break; done; true)

+    [ -n "$RAMDISK" ] && ln -sf $RAMDISK $imagedir/ramdisk && \

+                         IMAGE_RAMDISK="ari_location = $imagedir/ramdisk"

+    IMAGE=$(for f in "$imagedir/"*.img; do

+        [ -f "$f" ] && echo "$f" && break; done; true)

+    if [ -n "$IMAGE" ]; then

+        ln -sf $IMAGE $imagedir/disk

+        # Save the first image directory that contains a disk image link

+        if [ -z "$IMAGE_DIR" ]; then

+            IMAGE_DIR=$imagedir

+            IMAGE_NAME=$(basename ${IMAGE%.img})

+        fi

+    fi

+done

+if [[ -n "$IMAGE_NAME" ]]; then

+    # Get the image UUID

+    IMAGE_UUID=$(nova image-list | grep " $IMAGE_NAME " | cut -d'|' -f2)

+    # Strip spaces off

+    IMAGE_UUID=$(echo $IMAGE_UUID)

+fi

+

+# Create tempest.conf from tempest.conf.sample

+

+if [[ ! -r $TEMPEST_CONF ]]; then

+    cp $TEMPEST_CONF.sample $TEMPEST_CONF

+fi

+

+sed -e "

+    /^api_key=/s|=.*\$|=$ADMIN_PASSWORD|;

+    /^auth_url=/s|=.*\$|=${OS_AUTH_URL%/}/tokens/|;

+    /^host=/s|=.*\$|=$HOST_IP|;

+    /^image_ref=/s|=.*\$|=$IMAGE_UUID|;

+    /^password=/s|=.*\$|=$ADMIN_PASSWORD|;

+    /^tenant=/s|=.*\$|=$TENANT|;

+    /^tenant_name=/s|=.*\$|=$TENANT|;

+    /^user=/s|=.*\$|=$USERNAME|;

+    /^username=/s|=.*\$|=$USERNAME|;

+" -i $TEMPEST_CONF

+

+# Create config.ini

+

+CONFIG_INI_TMP=$(mktemp $CONFIG_INI.XXXXXX)

+if [ "$UPLOAD_LEGACY_TTY" ]; then

+    cat >$CONFIG_INI_TMP <<EOF

+[environment]

+aki_location = $TOP_DIR/files/images/aki-tty/image

+ari_location = $TOP_DIR/files/images/ari-tty/image

+ami_location = $TOP_DIR/files/images/ami-tty/image

+image_ref = 3

+image_ref_alt = 3

+flavor_ref = 1

+flavor_ref_alt = 2

+

+[glance]

+host = $GLANCE_HOST

+apiver = v1

+port = $GLANCE_PORT

+image_id = 3

+image_id_alt = 3

+tenant_id = 1

+EOF

+else

+    cat >$CONFIG_INI_TMP <<EOF

+[environment]

+aki_location = $IMAGE_DIR/kernel

+ami_location = $IMAGE_DIR/disk

+$IMAGE_RAMDISK

+image_ref = 2

+image_ref_alt = 2

+flavor_ref = 1

+flavor_ref_alt = 2

+

+[glance]

+host = $GLANCE_HOST

+apiver = v1

+port = $GLANCE_PORT

+image_id = 2

+image_id_alt = 2

+tenant_id = 1

+EOF

+fi

+

+cat >>$CONFIG_INI_TMP <<EOF

+

+[keystone]

+service_host = $HOST_IP

+service_port = 5000

+apiver = v2.0

+user = admin

+password = $ADMIN_PASSWORD

+tenant_name = admin

+

+[nova]

+host = $HOST_IP

+port = 8774

+apiver = v1.1

+project = admin

+user = admin

+key = $ADMIN_PASSWORD

+ssh_timeout = 300

+build_timeout = 300

+flavor_ref = 1

+flavor_ref_alt = 2

+multi_node = no

+

+[rabbitmq]

+host = $RABBIT_HOST

+user = guest

+password = $RABBIT_PASSWORD

+

+[swift]

+auth_host = $HOST_IP

+auth_port = 443

+auth_prefix = /auth/

+auth_ssl = yes

+account = system

+username = root

+password = password

+

+EOF

+mv $CONFIG_INI_TMP $CONFIG_INI

+CONFIG_INI_TMP=""

+

+trap - SIGHUP SIGINT SIGTERM SIGQUIT EXIT