summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml10
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yml69
-rwxr-xr-xjjb/dovetail/dovetail-run.sh13
3 files changed, 13 insertions, 79 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 70296bda1..5c5327016 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -209,12 +209,10 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
- # dovetail only master by now, not sync with A/B/C branches
# here the stream means the SUT stream, dovetail stream is defined in its own job
- # only run on os-(nosdn|odl_l2|odl_l3)-nofeature-ha scenario
- # run against SUT master/euphrates branch, dovetail docker image with latest tag(Monday, Tuesday)
- # run against SUT master/euphrates branch, dovetail docker image with cvp.X.X.X tag(Thursday, Friday)
- # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag on huawei-pod7
+ # only run on os-(nosdn|odl_l3)-nofeature-ha scenario
+ # run with testsuite default, dovetail docker image with latest tag(Monday, Tuesday)
+ # run with testsuite proposed_tests, dovetail docker image with latest tag(Thursday, Friday)
- conditional-step:
condition-kind: and
condition-operands:
@@ -229,7 +227,7 @@
use-build-time: true
steps:
- trigger-builds:
- - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
+ - project: 'dovetail-compass-{pod}-default-{stream}'
current-parameters: false
predefined-parameters: |
DOCKER_TAG=latest
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 99867c327..5e5b6e18f 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -20,18 +20,12 @@
dovetail-branch: '{stream}'
gs-pathname: ''
docker-tag: 'latest'
- danube: &danube
- stream: danube
- branch: 'stable/{stream}'
- dovetail-branch: master
- gs-pathname: '/{stream}'
- docker-tag: 'cvp.0.9.0'
euphrates: &euphrates
stream: euphrates
branch: 'stable/{stream}'
dovetail-branch: master
gs-pathname: '/{stream}'
- docker-tag: 'cvp.0.9.0'
+ docker-tag: 'latest'
# ----------------------------------
# POD, PLATFORM, AND BRANCH MAPPING
@@ -60,16 +54,6 @@
slave-label: fuel-baremetal
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - virtual:
- slave-label: fuel-virtual
- SUT: fuel
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - baremetal:
- slave-label: fuel-baremetal
- SUT: fuel
- auto-trigger-name: 'daily-trigger-disabled'
<<: *euphrates
- virtual:
slave-label: fuel-virtual
@@ -91,16 +75,6 @@
slave-label: compass-baremetal
SUT: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - virtual:
- slave-label: compass-virtual
- SUT: compass
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - baremetal:
- slave-label: compass-baremetal
- SUT: compass
- auto-trigger-name: 'daily-trigger-disabled'
<<: *euphrates
- virtual:
slave-label: compass-virtual
@@ -125,16 +99,6 @@
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- virtual:
- slave-label: apex-virtual-danube
- SUT: apex
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - baremetal:
- slave-label: apex-baremetal-danube
- SUT: apex
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - virtual:
slave-label: apex-virtual-master
SUT: apex
auto-trigger-name: 'daily-trigger-disabled'
@@ -159,16 +123,6 @@
slave-label: armband-baremetal
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - armband-virtual:
- slave-label: armband-virtual
- SUT: fuel
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - armband-baremetal:
- slave-label: armband-baremetal
- SUT: fuel
- auto-trigger-name: 'daily-trigger-disabled'
<<: *euphrates
- armband-virtual:
slave-label: armband-virtual
@@ -202,26 +156,6 @@
slave-label: zte-pod1
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - zte-pod3:
- slave-label: zte-pod3
- SUT: fuel
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - huawei-pod4:
- slave-label: huawei-pod4
- SUT: apex
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - huawei-pod7:
- slave-label: huawei-pod7
- SUT: compass
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *danube
- - zte-pod1:
- slave-label: zte-pod1
- SUT: fuel
- auto-trigger-name: 'daily-trigger-disabled'
<<: *euphrates
- zte-pod3:
slave-label: zte-pod3
@@ -241,6 +175,7 @@
# -------------------------------
testsuite:
+ - 'default'
- 'proposed_tests'
jobs:
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index e50242bd6..de92c1814 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -246,8 +246,6 @@ if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_T
sed -i 's/internal/public/g' ${OPENRC}
if [[ ${public_url} =~ 'v2' ]]; then
sed -i "s/OS_IDENTITY_API_VERSION=3/OS_IDENTITY_API_VERSION=2.0/g" ${OPENRC}
- sed -i '/OS_PROJECT_DOMAIN_NAME/d' ${OPENRC}
- sed -i '/OS_USER_DOMAIN_NAME/d' ${OPENRC}
fi
cat ${OPENRC}
fi
@@ -275,10 +273,13 @@ cp_tempest_cmd="docker cp ${DOVETAIL_CONFIG}/tempest_conf.yaml $container_id:/ho
echo "exec command: ${cp_tempest_cmd}"
$cp_tempest_cmd
-list_cmd="dovetail list ${TESTSUITE}"
-run_cmd="dovetail run --testsuite ${TESTSUITE} -d"
-echo "Container exec command: ${list_cmd}"
-docker exec $container_id ${list_cmd}
+if [[ ${TESTSUITE} == 'default' ]]; then
+ testsuite= ''
+else
+ testsuite= "--testsuite ${TESTSUITE}"
+fi
+
+run_cmd="dovetail run ${testsuite} -d"
echo "Container exec command: ${run_cmd}"
docker exec $container_id ${run_cmd}