diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2015-11-24 16:42:46 +0100 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2015-11-25 17:11:17 +0100 |
| commit | 9313ef2d793e85c5b83c2ebbd4430df01cea6785 (patch) | |
| tree | cb4f5a5ae4a21403ddfa444633a68216ddf409da /jjb/functest/functest.yml | |
| parent | 3510675a534afdb6e167607b544fb0e1bc7400d9 (diff) | |
Add Functest execution after APEX deployment
JIRA: FUNCTEST-69
Change-Id: I11ae219ac9090e59c992baa3835f428b3a614b19
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'jjb/functest/functest.yml')
| -rw-r--r-- | jjb/functest/functest.yml | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index cb72fc74b..fe6c8987d 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -9,18 +9,19 @@ node: 'opnfv-jump-2' installer_type: 'fuel' installer_ip: '10.20.0.2' - functest_repo_dir: '/home/opnfv/repos/functest' - foreman: node: 'opnfv-jump-2' installer_type: 'foreman' installer_ip: '172.30.10.73' - functest_repo_dir: '/home/opnfv/repos/functest' + - apex: + node: 'opnfv-jump-1' + installer_type: 'apex' + installer_ip: '192.168.X.X' pod: - orange-build: node: 'orange-build' installer_type: 'foreman' installer_ip: '172.30.10.73' - functest_repo_dir: '/home/opnfv/repos/functest' jobs: - 'set-functest-env-{pod}' @@ -199,6 +200,7 @@ parameters: - project-parameter: project: '{project}' + - functest-parameter - string: name: INSTALLER_TYPE default: '{installer_type}' @@ -207,10 +209,6 @@ name: INSTALLER_IP default: '{installer_ip}' description: "Installer IP." - - string: - name: FUNCTEST_REPO_DIR - default: '{functest_repo_dir}' - description: "Directory where the root functest repo is cloned in the docker." - '{pod}' scm: @@ -241,6 +239,7 @@ parameters: - project-parameter: project: '{project}' + - functest-parameter - string: name: INSTALLER_TYPE default: '{installer_type}' @@ -250,10 +249,6 @@ default: '{installer_ip}' description: "Installer IP." - string: - name: FUNCTEST_REPO_DIR - default: '{functest_repo_dir}' - description: "Directory where the root functest repo is cloned in the docker." - - string: name: GIT_BASE default: ssh://gerrit.opnfv.org:29418/$PROJECT description: "Override GIT_BASE" @@ -286,6 +281,7 @@ parameters: - project-parameter: project: '{project}' + - functest-parameter - string: name: INSTALLER_TYPE default: '{installer_type}' @@ -295,10 +291,6 @@ default: '{installer_ip}' description: "Installer IP." - string: - name: FUNCTEST_REPO_DIR - default: '{functest_repo_dir}' - description: "Directory where the root functest repo is cloned in the docker." - - string: name: GIT_BASE default: ssh://gerrit.opnfv.org:29418/$PROJECT description: "Override GIT_BASE" @@ -478,6 +470,10 @@ name: GS_PATHNAME default: '{gs-pathname}' description: "Version directory where the opnfv documents will be stored in gs repository" + - string: + name: FUNCTEST_REPO_DIR + default: "/home/opnfv/repos/functest" + description: "Directory where the Functest repository is cloned" - parameter: name: orange-build @@ -538,7 +534,10 @@ - shell: | #!/bin/bash set +e - + if [[ ${INSTALLER_TYPE} == 'apex' ]]; then + INSTALLER_IP=$(cat instack /var/lib/libvirt/dnsmasq/default.leases \ + |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}" docker pull opnfv/functest:latest_stable |