diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/functest/functest.yml | 43 | ||||
| -rw-r--r-- | jjb/qtip/qtip.yml | 22 |
2 files changed, 44 insertions, 21 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 1ed6e6c5b..9e5e71b16 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -21,22 +21,27 @@ node: 'huawei-us-deploy-bare-1' installer_type: 'compass' installer_ip: '192.168.200.2' + - joid: + node: 'intel-us-deploy-bare-pod5' + installer_type: 'compass' + installer_ip: '127.0.0.1' pod: - 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' - - huawei-build: node: 'huawei-us-deploy-bare-1' installer_type: 'compass' installer_ip: '192.168.200.2' - + - intel-us-deploy-bare-pod5: + node: 'intel-us-deploy-bare-pod5' + installer_type: 'joid' + installer_ip: '127.0.0.1' jobs: - 'set-functest-env-{pod}' @@ -72,7 +77,7 @@ - job-template: name: set-functest-env-{pod} - node: '{pod}' + node: '{node}' builders: - 'set-functest-env' @@ -80,7 +85,7 @@ - job-template: name: clean-functest-env-{pod} - node: '{pod}' + node: '{node}' builders: - 'functest-cleanup' @@ -104,7 +109,7 @@ - job-template: name: functest-openstack-bench-test-{pod} - node: '{pod}' + node: '{node}' builders: - 'functest-rally-bench' @@ -112,7 +117,7 @@ - job-template: name: functest-openstack-tempest-smoke-test-{pod} - node: '{pod}' + node: '{node}' builders: - 'functest-tempest-smoke' @@ -120,7 +125,7 @@ - job-template: name: functest-odl-test-{pod} - node: '{pod}' + node: '{node}' builders: - shell: | @@ -129,7 +134,7 @@ - job-template: name: functest-vping-test-{pod} - node: '{pod}' + node: '{node}' builders: - 'functest-vping' @@ -137,7 +142,7 @@ - job-template: name: functest-{pod} - node: '{pod}' + node: '{node}' parameters: - project-parameter: @@ -301,7 +306,7 @@ builders: - shell: - !include-raw ../opnfvdocs/docu-build.sh + echo "Hello World" - job-template: name: 'functest-merge-{stream}' @@ -391,6 +396,18 @@ description: "Override GIT_BASE" - parameter: + name: intel-us-deploy-bare-pod5 + parameters: + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: "Override GIT_BASE" + - string: + name: LAB_CONFIG + default: "/joid/ci/odl/juju-deployer/scripts/cloud/" + description: "Openstack credentials on the dev lab" + +- parameter: name: opnfv-jump-2 parameters: - string: @@ -433,8 +450,8 @@ #!/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') + INSTALLER_IP=$(grep instack /var/lib/libvirt/dnsmasq/default.leases \ + |awk '{print $3}' | head -n 1) sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa" fi echo "Functest: Start Docker and prepare environment" diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml index d4d21a35d..c08b1ca50 100644 --- a/jjb/qtip/qtip.yml +++ b/jjb/qtip/qtip.yml @@ -225,11 +225,11 @@ builders: - shell: | #! /bin/bash - if [[ ! -f $HOME/opnfv-openrc.sh ]]; then - echo "Unable to access file $HOME/opnfv-openrc.sh" + if [[ ! -f $WORKSPACE/opnfv-openrc.sh ]]; then + echo "Unable to access file $WORKSPACE/opnfv-openrc.sh" exit 1 fi - source $HOME/opnfv-openrc.sh + source $WORKSPACE/opnfv-openrc.sh cd $WORKSPACE echo "Running QTIP dhrystone with First Test case" python qtip.py -s compute -b dhrystone_serial.yaml @@ -240,11 +240,11 @@ builders: - shell: | #!/bin/bash - if [[ ! -f $HOME/opnfv-openrc.sh ]]; then - echo "Unable to access file $HOME/opnfv-openrc.sh" + if [[ ! -f $WORKSPACE/opnfv-openrc.sh ]]; then + echo "Unable to access file $WORKSPACE/opnfv-openrc.sh" exit 1 fi - source $HOME/opnfv-openrc.sh + source $WORKSPACE/opnfv-openrc.sh cd $WORKSPACE echo "Running QTIP dhrystone with Second Test case" python qtip.py -s compute -b ssl_parallel.yaml @@ -252,5 +252,11 @@ - builder: name: qtip-fetch-os-cred builders: - - shell: - !include-raw ../../utils/fetch_os_creds.sh + - shell: | + echo $HOME + echo $WORKSPACE + cd $WORKSPACE + git clone https://gerrit.opnfv.org/gerrit/releng + cd $WORKSPACE/releng/utils + ./fetch_os_creds.sh #To test the problem with creating the file in $HOME + ./fetch_os_creds.sh -d $WORKSPACE #To test if the file can be created in $WORKSPACE |