diff options
| -rw-r--r-- | jjb/apex/apex.yml | 8 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 2 | ||||
| -rw-r--r-- | jjb/fuel/fuel-verify-jobs.yml | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 1 | ||||
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 8 | ||||
| -rwxr-xr-x | jjb/moon/moon-verify.sh | 3 | ||||
| -rw-r--r-- | jjb/moon/moon.yml | 4 | ||||
| -rw-r--r-- | utils/opnfv-artifacts.py | 11 |
8 files changed, 22 insertions, 18 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index edc669e85..8f9f49e27 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -714,6 +714,8 @@ 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-{stream1}' @@ -742,6 +744,8 @@ 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-{stream1}' @@ -770,6 +774,8 @@ 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-{stream1}' @@ -798,6 +804,8 @@ 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-{stream1}' diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 025984990..0231ea588 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -47,7 +47,7 @@ cd $WORKSPACE export OS_VERSION=${COMPASS_OS_VERSION} export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION} if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" ]]; then - export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${OS_VERSION} + export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION} fi ./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF} if [ $? -ne 0 ]; then diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml index 6fd06f706..2b6239422 100644 --- a/jjb/fuel/fuel-verify-jobs.yml +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -182,8 +182,7 @@ properties: - throttle: enabled: true - max-total: 4 - max-per-node: 1 + max-total: 6 option: 'project' - build-blocker: use-build-blocker: true diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 727419d8e..28ea6438f 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -218,6 +218,7 @@ - 'tempest_full_parallel' - 'rally_full' - 'vims' + - 'multisite' - parameter: name: functest-parameter parameters: diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 3bfd65edf..61c1f825e 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -69,6 +69,8 @@ auto-trigger-name: 'daily-trigger-disabled' - 'os-onos-nofeature-noha': auto-trigger-name: 'daily-trigger-disabled' + - 'os-onos-sfc-ha': + auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-ha': auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-noha': @@ -301,6 +303,12 @@ triggers: - timed: '' +# os-onos-sfc-ha trigger - branch: master +- trigger: + name: 'joid-os-onos-sfc-ha-baremetal-master-trigger' + triggers: + - timed: '0 21 * * *' + # os-onos-nofeature-ha trigger - branch: stable/brahmaputra - trigger: name: 'joid-os-onos-nofeature-ha-baremetal-brahmaputra-trigger' diff --git a/jjb/moon/moon-verify.sh b/jjb/moon/moon-verify.sh deleted file mode 100755 index 23bf47c06..000000000 --- a/jjb/moon/moon-verify.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "Hello World" diff --git a/jjb/moon/moon.yml b/jjb/moon/moon.yml index 0044eb9ec..55d593f85 100644 --- a/jjb/moon/moon.yml +++ b/jjb/moon/moon.yml @@ -51,4 +51,6 @@ builders: - shell: - !include-raw: ./moon-verify.sh + #!/bin/bash + echo "launch Moon unit tests" + nosetest $WORKSPACE/keystone-moon/keystone/tests/moon/unit
\ No newline at end of file diff --git a/utils/opnfv-artifacts.py b/utils/opnfv-artifacts.py index f826d5ce6..876efedba 100644 --- a/utils/opnfv-artifacts.py +++ b/utils/opnfv-artifacts.py @@ -130,14 +130,6 @@ def has_logs(gerrit_review): return False -def has_md5hash(item): - """ - If a file has an md5hash available, grab it - """ - if 'md5Hash' in item: - return item['md5Hash'] - return False - def has_ignorable_extension(filename): for extension in ignore_extensions: @@ -158,7 +150,6 @@ def get_results(key): 'items(' 'name,' 'mediaLink,' - 'md5Hash,' 'updated,' 'contentType,' 'size' @@ -189,7 +180,6 @@ def get_results(key): else: href = site['mediaLink'] href_type = 'download' - md5 = has_md5hash(site) gerrit = has_gerrit_review(site_split) logs = False # has_logs(gerrit) @@ -215,7 +205,6 @@ def get_results(key): 'href': href, 'href_type': href_type, 'proxy_href': proxy, - 'md5hash': md5, } if project in releases: |