summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2015-12-03 11:39:46 +0100
committerMorgan Richomme <morgan.richomme@orange.com>2015-12-03 15:34:54 +0100
commitef18db39fe10d24fc3a2b3fb0dea65d1f65c324b (patch)
tree9130e535e7e0f05c28c4750c210c8023f05bddd9
parentd33a59dc129807774c64452b97154e2c86bd7b16 (diff)
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 JIRA: RELENG-60 Change-Id: Ie306edce83296f84f705a707e99dd9c9fce88607 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
-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)