X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Freleng%2Fopnfv-docker.yaml;h=ac1c5741c0c5b962886da380abc305e1ecc98f84;hb=96c0fe07960eff4068feaf2ee066a3497fcfe891;hp=3bedd9153cbec5e4b69fd707393fca09c2d4ba46;hpb=2f16f752b470be35e18a8a8ffb6861ec84658695;p=releng.git

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 3bedd9153..ac1c5741c 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: ''
 
@@ -58,10 +55,10 @@
           dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
           <<: *master
           <<: *other-receivers
-      - 'barometer-collectd-master':
+      - 'barometer-collectd-latest':
           project: 'barometer'
           dockerdir: '.'
-          dockerfile: 'docker/barometer-collectd-master/Dockerfile'
+          dockerfile: 'docker/barometer-collectd-latest/Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'barometer-dma':
@@ -94,10 +91,6 @@
           dockerdir: 'docker/barometer-snmp'
           <<: *master
           <<: *other-receivers
-      - 'bottlenecks':
-          project: 'bottlenecks'
-          <<: *master
-          <<: *other-receivers
       - 'clover':
           project: 'clover'
           dockerdir: '.'
@@ -182,10 +175,6 @@
           dockerfile: 'Dockerfile'
           <<: *master
           <<: *other-receivers
-      - 'cperf':
-          project: 'cperf'
-          <<: *master
-          <<: *other-receivers
       - 'dovetail':
           project: 'dovetail'
           <<: *master
@@ -222,17 +211,6 @@
           dockerfile: 'worker/Dockerfile'
           <<: *master
           <<: *laas_receivers
-      - 'qtip':
-          project: 'qtip'
-          dockerdir: '.'
-          dockerfile: 'docker/Dockerfile.local'
-          <<: *master
-          <<: *other-receivers
-      - 'qtip-nettest':
-          project: 'qtip'
-          dockerdir: 'contrib/nettest'
-          <<: *master
-          <<: *other-receivers
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
@@ -269,34 +247,12 @@
           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
       - 'barometer-dma':
@@ -387,24 +343,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
 ########################
@@ -473,30 +411,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/**'