Add Jerma Stream to Docker Jobs

[releng.git] / jjb / releng / opnfv-docker.yaml

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 24b1b85..29a66f1 100644 (file)
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -19,6 +19,10 @@
       stream: iruya
       branch: 'stable/{stream}'
       disabled: false
+    jerma: &jerma
+      stream: jerma
+      branch: 'stable/{stream}'
+      disabled: false
     laas-receivers: &laas_receivers
       receivers: >
           pberberian@iol.unh.edu
@@ -26,9 +30,6 @@
     storperf-receivers: &storperf-receivers
       receivers: >
           mbeierl@vmware.com
-    yardstick-receivers: &yardstick-receivers
-      receivers: >
-          rexlee8776@gmail.com
     other-receivers: &other-receivers
       receivers: ''
 
@@ -58,10 +59,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 +95,6 @@
           dockerdir: 'docker/barometer-snmp'
           <<: *master
           <<: *other-receivers
-      - 'bottlenecks':
-          project: 'bottlenecks'
-          <<: *master
-          <<: *other-receivers
       - 'clover':
           project: 'clover'
           dockerdir: '.'
@@ -182,10 +179,6 @@
           dockerfile: 'Dockerfile'
           <<: *master
           <<: *other-receivers
-      - 'cperf':
-          project: 'cperf'
-          <<: *master
-          <<: *other-receivers
       - 'dovetail':
           project: 'dovetail'
           <<: *master
@@ -222,17 +215,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,40 +251,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 +347,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 +415,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/**'