summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-08-03 13:05:11 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-08-03 13:11:42 +0200
commit64e2eceed97ff85ac1e60c3aeb5e4c0ead1c4a05 (patch)
treeafa3dfbb9233d601b1d6220e1fe04fbab6949408
parent0dbccc7ba9b2a4a7af1955093555c2a561b5cbb2 (diff)
Remove obsolete OPNFV docker builds
YardStick, Bottlenecks and Daisy dropped [1] [1] https://wiki.opnfv.org/display/PROJ/Project+Directory Change-Id: Ib0ae1ee5f41b5bd742add1807ae78e93999d8e1e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--jjb/releng/opnfv-docker-arm.yaml19
-rw-r--r--jjb/releng/opnfv-docker.yaml78
2 files changed, 0 insertions, 97 deletions
diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml
index a41332636..e8a227f5b 100644
--- a/jjb/releng/opnfv-docker-arm.yaml
+++ b/jjb/releng/opnfv-docker-arm.yaml
@@ -32,11 +32,6 @@
cristina.pauna@enea.com
alexandru.avadanii@enea.com
mbeierl@vmware.com
- yardstick-arm-receivers: &yardstick-arm-receivers
- receivers: >
- cristina.pauna@enea.com
- alexandru.avadanii@enea.com
- delia.popescu@enea.com
other-receivers: &other-receivers
receivers: ''
@@ -95,10 +90,6 @@
arch_tag: 'aarch64'
<<: *master
<<: *storperf-arm-receivers
- - 'yardstick':
- project: 'yardstick'
- <<: *master
- <<: *yardstick-arm-receivers
# projects with jobs for stable/euphrates
- 'dovetail':
@@ -106,17 +97,7 @@
<<: *euphrates
<<: *dovetail-arm-receivers
- # projects with jobs for stable/hunter
- - 'yardstick':
- project: 'yardstick'
- <<: *hunter
- <<: *yardstick-arm-receivers
-
# projects with jobs for stable/iruya
- - 'yardstick':
- project: 'yardstick'
- <<: *iruya
- <<: *yardstick-arm-receivers
- 'storperf-master':
project: 'storperf'
dockerdir: 'docker/storperf-master'
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 24b1b85b5..b6c4a484b 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -26,9 +26,6 @@
storperf-receivers: &storperf-receivers
receivers: >
mbeierl@vmware.com
- yardstick-receivers: &yardstick-receivers
- receivers: >
- rexlee8776@gmail.com
other-receivers: &other-receivers
receivers: ''
@@ -94,10 +91,6 @@
dockerdir: 'docker/barometer-snmp'
<<: *master
<<: *other-receivers
- - 'bottlenecks':
- project: 'bottlenecks'
- <<: *master
- <<: *other-receivers
- 'clover':
project: 'clover'
dockerdir: '.'
@@ -269,40 +262,14 @@
arch_tag: 'x86_64'
<<: *master
<<: *storperf-receivers
- - 'yardstick':
- project: 'yardstick'
- <<: *master
- <<: *yardstick-receivers
- - 'yardstick-ubuntu-18.04':
- project: 'yardstick'
- dockerfile: 'Dockerfile_ubuntu18'
- <<: *master
- <<: *yardstick-receivers
- - 'yardstick-image-k8s':
- project: 'yardstick'
- dockerdir: 'docker/k8s'
- <<: *master
- <<: *yardstick-receivers
# projects with jobs for hunter
- - 'bottlenecks':
- project: 'bottlenecks'
- <<: *hunter
- <<: *other-receivers
- 'dovetail':
project: 'dovetail'
<<: *hunter
<<: *other-receivers
- - 'yardstick':
- project: 'yardstick'
- <<: *hunter
- <<: *yardstick-receivers
# projects with jobs for iruya
- - 'yardstick':
- project: 'yardstick'
- <<: *iruya
- <<: *yardstick-receivers
- 'barometer-dma':
project: 'barometer'
dockerdir: 'docker/barometer-dma'
@@ -391,24 +358,6 @@
jobs:
- "{dockerrepo}-docker-build-push-{stream}"
-- project:
-
- name: opnfv-monitor-docker # projects which only monitor dedicated file or path
-
- dockerfile: "Dockerfile"
- dockerdir: "docker"
- arch_tag: ""
- extra_build_args: ""
-
- project:
- # projects with jobs for master
- - 'daisy':
- dockerrepo: 'daisy'
- <<: *master
-
- jobs:
- - '{project}-docker-build-push-monitor-{stream}'
-
########################
# job templates
########################
@@ -477,30 +426,3 @@
- email:
recipients: '{receivers}'
- email-jenkins-admins-on-failure
-
-- job-template:
- name: '{project}-docker-build-push-monitor-{stream}'
- disabled: '{obj:disabled}'
- parameters: *parameters
-
- scm:
- - git-scm
-
- builders: *builders
-
- # trigger only matching the file name
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- file-paths:
- - compare-type: ANT
- pattern: 'docker/**'