diff options
| -rw-r--r-- | jjb/functest/functest-project-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 4 | ||||
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 11 | ||||
| -rwxr-xr-x | jjb/xci/xci-set-scenario.sh | 1 | ||||
| -rw-r--r-- | releases/fraser/functest.yaml | 3 |
5 files changed, 9 insertions, 14 deletions
diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index b3ab3ca37..3adf8808c 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -22,10 +22,6 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - euphrates: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false phase: - 'unit-tests-and-docs': diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index 0290ea0a9..0fe76f029 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -175,7 +175,9 @@ <<: *other-receivers - 'qtip': project: 'qtip' - <<: *euphrates + dockerdir: '.' + dockerfile: 'docker/Dockerfile.local' + <<: *fraser <<: *other-receivers - 'storperf-master': project: 'storperf' diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh index 78b7d442c..7fb0be9b9 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -24,12 +24,6 @@ if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]]; then exit 0 fi -# skip the healthcheck if the scenario is Kubernetes scenario -if [[ "$DEPLOY_SCENARIO" =~ k8 ]]; then - echo "Skipping the healthcheck!" - exit 0 -fi - # if the scenario is external, we need to wipe WORKSPACE to place releng-xci there since # the project where the scenario is coming from is cloned and the patch checked out to the # xci/scenarios/$DEPLOY_SCENARIO to be synched on clean VM @@ -50,9 +44,10 @@ if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENT fi # set XCI_VENV for ansible -export XCI_VENV=/home/devuser/releng-xci/venv +export XCI_PATH=/home/devuser/releng-xci +export XCI_VENV=${XCI_PATH}/venv -ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; cd releng-xci/xci && ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml" +ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; source ${XCI_PATH}/.cache/xci.env && cd releng-xci/xci && ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml" echo "Running functest" ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh" # Record exit code diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh index 3e64ab140..b591dd23c 100755 --- a/jjb/xci/xci-set-scenario.sh +++ b/jjb/xci/xci-set-scenario.sh @@ -7,7 +7,6 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -set -o errexit set -o pipefail #---------------------------------------------------------------------- diff --git a/releases/fraser/functest.yaml b/releases/fraser/functest.yaml index 9956e9681..a070418aa 100644 --- a/releases/fraser/functest.yaml +++ b/releases/fraser/functest.yaml @@ -10,3 +10,6 @@ branches: - name: stable/fraser location: functest-kubernetes: 64d61b6a116d3b12e0f4f42c3240262ea6359fd8 + - name: stable/fraser + location: + functest-xtesting: 4e4d8c583fe403db095e950c06030586f2aa929a |