summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/apex/apex.yml8
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml46
-rw-r--r--utils/opnfv-artifacts.py11
3 files changed, 54 insertions, 11 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-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 6bfc73778..d469e5736 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -63,6 +63,12 @@
- 'os-onos-sfc-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-odl_l2-moon-noha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-kvm-ha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
@@ -253,6 +259,14 @@
name: 'compass-os-onos-sfc-ha-huawei-pod2-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-huawei-pod2-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-huawei-pod2-master-trigger'
+ triggers:
+ - timed: ''
- trigger:
name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
@@ -278,6 +292,14 @@
name: 'compass-os-onos-sfc-ha-baremetal-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-baremetal-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
+ triggers:
+ - timed: ''
- trigger:
name: 'compass-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger'
@@ -303,6 +325,14 @@
name: 'compass-os-onos-sfc-ha-baremetal-brahmaputra-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-baremetal-brahmaputra-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-baremetal-brahmaputra-trigger'
+ triggers:
+ - timed: ''
- trigger:
name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
@@ -328,6 +358,14 @@
name: 'compass-os-onos-sfc-ha-virtual-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
+ triggers:
+ - timed: ''
- trigger:
name: 'compass-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
@@ -353,3 +391,11 @@
name: 'compass-os-onos-sfc-ha-virtual-brahmaputra-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-moon-noha-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-nosdn-kvm-ha-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
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: