X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.yaml;h=98d2acc54260c63044be78368165b47293d32a71;hb=20a10fda0c2442d3764ce4bacff33ba23f53d0c2;hp=3bedd9153cbec5e4b69fd707393fca09c2d4ba46;hpb=64ebe7a4dacc921620421b93c245870b88ae6b5b;p=releng.git

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 3bedd9153..98d2acc54 100644
--- 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,10 @@
     storperf-receivers: &storperf-receivers
       receivers: >
           mbeierl@vmware.com
-    yardstick-receivers: &yardstick-receivers
+    samplevnf-receivers: &samplevnf-receivers
       receivers: >
-          rexlee8776@gmail.com
+          luc.provoost@intel.com
+          yury.kylulin@intel.com
     other-receivers: &other-receivers
       receivers: ''
 
@@ -58,10 +63,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,98 +99,6 @@
           dockerdir: 'docker/barometer-snmp'
           <<: *master
           <<: *other-receivers
-      - 'bottlenecks':
-          project: 'bottlenecks'
-          <<: *master
-          <<: *other-receivers
-      - 'clover':
-          project: 'clover'
-          dockerdir: '.'
-          dockerfile: 'docker/Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-ns-nginx-lb':
-          project: 'clover'
-          dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'subservices/lb/Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-ns-nginx-proxy':
-          project: 'clover'
-          dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'subservices/proxy/Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-ns-nginx-server':
-          project: 'clover'
-          dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'subservices/server/Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-ns-snort-ids':
-          project: 'clover'
-          dockerdir: 'samples/services/snort_ids/docker'
-          dockerfile: 'Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-controller':
-          project: 'clover'
-          dockerdir: 'clover/controller'
-          dockerfile: 'docker/Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-collector':
-          project: 'clover'
-          dockerdir: 'clover/collector'
-          dockerfile: 'docker/Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-jmeter-master':
-          project: 'clover'
-          dockerdir: 'clover/tools/jmeter'
-          dockerfile: 'jmeter-master/Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-jmeter-slave':
-          project: 'clover'
-          dockerdir: 'clover/tools/jmeter'
-          dockerfile: 'jmeter-slave/Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-sample-app':
-          project: 'clover'
-          dockerdir: 'samples/scenarios/sample_app'
-          dockerfile: 'Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-ns-modsecurity-crs':
-          project: 'clover'
-          dockerdir: 'samples/services/modsecurity/docker'
-          dockerfile: 'Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-spark':
-          project: 'clover'
-          dockerdir: 'clover/spark/docker/clover-spark'
-          dockerfile: 'Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-spark-submit':
-          project: 'clover'
-          dockerdir: 'clover/spark/docker/spark-submit'
-          dockerfile: 'Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'clover-clovisor':
-          project: 'clover'
-          dockerdir: 'clover/clovisor'
-          dockerfile: 'Dockerfile'
-          <<: *master
-          <<: *other-receivers
-      - 'cperf':
-          project: 'cperf'
-          <<: *master
-          <<: *other-receivers
       - 'dovetail':
           project: 'dovetail'
           <<: *master
@@ -222,17 +135,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,83 +171,19 @@
           arch_tag: 'x86_64'
           <<: *master
           <<: *storperf-receivers
-      - 'yardstick':
-          project: 'yardstick'
-          <<: *master
-          <<: *yardstick-receivers
-      - 'yardstick-ubuntu-18.04':
-          project: 'yardstick'
-          dockerfile: 'Dockerfile_ubuntu18'
+      - 'rapid':
+          project: 'samplevnf'
+          dockerdir: 'VNFs/DPPD-PROX/helper-scripts/rapid'
           <<: *master
-          <<: *yardstick-receivers
-      - 'yardstick-image-k8s':
-          project: 'yardstick'
-          dockerdir: 'docker/k8s'
-          <<: *master
-          <<: *yardstick-receivers
+          <<: *samplevnf-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':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-dma'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-collectd':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-collectd'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-collectd-experimental':
-          project: 'barometer'
-          dockerdir: '.'
-          dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-collectd-master':
-          project: 'barometer'
-          dockerdir: '.'
-          dockerfile: 'docker/barometer-collectd-master/Dockerfile'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-grafana':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-grafana'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-influxdb':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-influxdb'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-kafka':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-kafka'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-ves':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-ves'
-          <<: *iruya
-          <<: *other-receivers
-      - 'barometer-snmp':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-snmp'
-          <<: *iruya
-          <<: *other-receivers
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
@@ -383,28 +221,59 @@
           <<: *iruya
           <<: *storperf-receivers
 
+      # projects with jobs for jerma
+      - 'barometer-collectd':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-collectd'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-collectd-experimental':
+          project: 'barometer'
+          dockerdir: '.'
+          dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-collectd-latest':
+          project: 'barometer'
+          dockerdir: '.'
+          dockerfile: 'docker/barometer-collectd-latest/Dockerfile'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-dma':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-dma'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-grafana':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-grafana'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-influxdb':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-influxdb'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-kafka':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-kafka'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-ves':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-ves'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-snmp':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-snmp'
+          <<: *jerma
+          <<: *other-receivers
+
     # yamllint enable rule:key-duplicates
     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 +342,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/**'