summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorRyota Mibu <r-mibu@cq.jp.nec.com>2015-12-04 06:01:11 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-04 06:01:11 +0000
commitc4fc0f6cc37f32d3250092266dc640486b32c2cb (patch)
tree256469ec77141494ab912c3d881115f709cd7909 /jjb
parent1afebc0a435e182db12ce65faf6e6347d01d3f59 (diff)
parentef18db39fe10d24fc3a2b3fb0dea65d1f65c324b (diff)
Merge "Add new parameters to manage POD name and dev lab Use NODE_NAME when creating the docker file Add -v with the path to the OpenStack creds"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest.yml38
1 files changed, 31 insertions, 7 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index e4f1260ae..dccc43103 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -18,11 +18,16 @@
installer_type: 'apex'
installer_ip: '192.168.X.X'
pod:
- - orange-build:
- node: 'orange-build'
- installer_type: 'foreman'
+ - orange-test1:
+ node: 'orange-test1'
+ installer_type: 'fuel'
installer_ip: '172.30.10.73'
+ - orange-fr-pod2:
+ node: 'orange-fr-pod2'
+ installer_type: 'joid'
+ installer_ip: '127.0.0.1'
+
jobs:
- 'set-functest-env-{pod}'
- 'functest-{pod}'
@@ -412,7 +417,7 @@
description: "Directory where the Functest repository is cloned"
- parameter:
- name: orange-build
+ name: orange-test1
parameters:
- string:
name: GIT_BASE
@@ -420,6 +425,18 @@
description: "Override GIT_BASE"
- parameter:
+ name: orange-fr-pod2
+ parameters:
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: "Override GIT_BASE"
+ - string:
+ name: LAB_CONFIG
+ default: "/home/opnfv/repos/functest"
+ description: "Openstack credentials on the dev lab"
+
+- parameter:
name: opnfv-jump-1
parameters:
- string:
@@ -474,10 +491,17 @@
|sed 's/.*192/192/g' | sed 's/\ in.*//g')
fi
echo "Functest: Start Docker and prepare environment"
- envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}"
+ envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
+ labconfig = ""
+ # If production lab then creds may be retrieved dynamically
+ # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
+ if [ -n "${LAB_CONFIG}" ]; then
+ labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
+ fi
docker pull opnfv/functest:latest_stable
- echo "Functest: Running docker run command: docker run -i -e $envs opnfv/functest:latest_stable /bin/bash &"
- docker run -id -e $envs opnfv/functest:latest_stable /bin/bash
+ cmd = "docker run -id -e $envs ${labconfig} opnfv/functest:latest_stable /bin/bash"
+ echo "Functest: Running docker run command: ${cmd}"
+ ${cmd}
docker ps -a
sleep 5
container_id=$(docker ps | grep 'opnfv/functest:latest_stable' | awk '{print $1}' | head -1)