diff options
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 9 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 54 | ||||
| -rw-r--r-- | jjb/qtip/qtip-validate-jobs.yml | 14 | ||||
| -rw-r--r-- | utils/test/reporting/functest/testCase.py | 12 |
4 files changed, 66 insertions, 23 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index c91e3ee82..564c9cdb8 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -196,6 +196,15 @@ else NETWORK_SETTINGS_DIR="/root/network" INVENTORY_FILE="/root/inventory/pod_settings.yaml" + # if fdio on baremetal, then we are using UCS enic and + # need to use vfio-pci instead of uio generic + if [[ "$DEPLOY_SCENARIO" == *fdio* ]]; then + TMP_DEPLOY_FILE="${WORKSPACE}/${DEPLOY_SCENARIO}.yaml" + cp -f ${DEPLOY_FILE} ${TMP_DEPLOY_FILE} + sed -i 's/^\(\s*uio-driver:\).*$/\1 vfio-pci/g' ${TMP_DEPLOY_FILE} + DEPLOY_FILE=${TMP_DEPLOY_FILE} + fi + if ! sudo test -e "$INVENTORY_FILE"; then echo "ERROR: Required settings file missing: Inventory settings file ${INVENTORY_FILE}" exit 1 diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 60340e9ca..93eaa6c6c 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -611,17 +611,17 @@ # i.e. one tempest smoke ipv6, two vping from functest) # 4.not used for release criteria or compliance, # only to debug the dovetail tool bugs with apex - - trigger-builds: - - project: 'dovetail-apex-{slave}-debug-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO=os-nosdn-nofeature-ha - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' + #- trigger-builds: + # - project: 'dovetail-apex-{slave}-debug-{stream}' + # current-parameters: false + # predefined-parameters: + # DEPLOY_SCENARIO=os-nosdn-nofeature-ha + # block: true + # same-node: true + # block-thresholds: + # build-step-failure-threshold: 'never' + # failure-threshold: 'never' + # unstable-threshold: 'FAILURE' - trigger-builds: - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}' predefined-parameters: | @@ -832,6 +832,36 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'apex-deploy-baremetal-os-nosdn-fdio-ha-{stream}' + predefined-parameters: | + BUILD_DIRECTORY=apex-build-{stream}/.build + OPNFV_CLEAN=yes + git-revision: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + block: true + - trigger-builds: + - project: 'functest-apex-{daily-slave}-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-nosdn-fdio-ha + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-apex-{slave}-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-nosdn-fdio-ha + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' # CSIT promote - job-template: @@ -1047,7 +1077,7 @@ - trigger: name: 'apex-master' triggers: - - timed: '0 3 * * 7' + - timed: '0 3 1 1 7' - trigger: name: 'apex-danube' triggers: diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml index 4cd8490fd..b8d2089d4 100644 --- a/jjb/qtip/qtip-validate-jobs.yml +++ b/jjb/qtip/qtip-validate-jobs.yml @@ -38,7 +38,7 @@ auto-trigger-name: 'qtip-daily-{pod}-trigger' - validate: auto-builder-name: qtip-validate-setup - auto-trigger-name: qtip-validate-trigger + auto-trigger-name: gerrit-trigger-change-merged - experimental: auto-builder-name: qtip-validate-setup auto-trigger-name: experimental @@ -58,7 +58,8 @@ parameters: - qtip-common-parameters: project: '{project}' - <<: *master + branch: '{branch}' + docker-tag: '{docker-tag}' - '{installer}-defaults' - '{pod}-defaults' - string: @@ -82,7 +83,6 @@ #--------- # builder #--------- - - builder: name: qtip-common-builders builders: @@ -144,11 +144,3 @@ name: qtip-daily-zte-pod3-trigger triggers: - timed: '0 1 * * *' - -- trigger: - name: qtip-validate-trigger - triggers: - - gerrit-trigger-change-merged: - project: '{project}' - branch: '{branch}' - files: '**' diff --git a/utils/test/reporting/functest/testCase.py b/utils/test/reporting/functest/testCase.py index f77136e11..c89e619c0 100644 --- a/utils/test/reporting/functest/testCase.py +++ b/utils/test/reporting/functest/testCase.py @@ -28,6 +28,7 @@ class TestCase(object): 'tempest_smoke_serial': 'Tempest (smoke)', 'tempest_full_parallel': 'Tempest (full)', 'tempest_defcore': 'Tempest (Defcore)', + 'refstack_defcore': 'Refstack', 'rally_sanity': 'Rally (smoke)', 'bgpvpn': 'bgpvpn', 'rally_full': 'Rally (full)', @@ -47,6 +48,11 @@ class TestCase(object): 'snaps_smoke': 'SNAPS', 'snaps_health_check': 'Health (dhcp)', 'netready': 'Netready', + 'fds': 'FDS', + 'cloudify_ims': 'vIMS (Cloudify)', + 'orchestra_ims': 'OpenIMS (OpenBaton)', + 'opera_ims': 'vIMS (Open-O)', + 'vyos_vrouter': 'vyos', 'barometer': 'Barometer'} try: self.displayName = display_name_matrix[self.name] @@ -127,6 +133,7 @@ class TestCase(object): 'tempest_smoke_serial': 'tempest_smoke_serial', 'tempest_full_parallel': 'tempest_full_parallel', 'tempest_defcore': 'tempest_defcore', + 'refstack_defcore': 'refstack_defcore', 'rally_sanity': 'rally_sanity', 'bgpvpn': 'bgpvpn', 'rally_full': 'rally_full', @@ -146,6 +153,11 @@ class TestCase(object): 'snaps_smoke': 'snaps_smoke', 'snaps_health_check': 'snaps_health_check', 'netready': 'gluon_vping', + 'fds': 'fds', + 'cloudify_ims': 'cloudify_ims', + 'orchestra_ims': 'orchestra_ims', + 'opera_ims': 'opera_ims', + 'vyos_vrouter': 'vyos_vrouter', 'barometer': 'barometercollectd'} try: return test_match_matrix[self.name] |