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

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 17235b37d..98d2acc54 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -11,40 +11,36 @@
       stream: master
       branch: '{stream}'
       disabled: false
-    danube: &danube
-      stream: danube
+    hunter: &hunter
+      stream: hunter
       branch: 'stable/{stream}'
       disabled: false
-    euphrates: &euphrates
-      stream: euphrates
+    iruya: &iruya
+      stream: iruya
       branch: 'stable/{stream}'
       disabled: false
-    fraser: &fraser
-      stream: fraser
+    jerma: &jerma
+      stream: jerma
       branch: 'stable/{stream}'
       disabled: false
-    gambia: &gambia
-      stream: gambia
-      branch: 'stable/{stream}'
-      disabled: false
-    pharos-tools-receivers: &pharos_tools_receivers
+    laas-receivers: &laas_receivers
       receivers: >
           pberberian@iol.unh.edu
           sbergeron@iol.unh.edu
     storperf-receivers: &storperf-receivers
       receivers: >
-          mark.beierl@emc.com
-    yardstick-receivers: &yardstick-receivers
+          mbeierl@vmware.com
+    samplevnf-receivers: &samplevnf-receivers
       receivers: >
-          limingjiang@huawei.com
-          rexlee8776@gmail.com
-          emma.l.foley@intel.com
+          luc.provoost@intel.com
+          yury.kylulin@intel.com
     other-receivers: &other-receivers
       receivers: ''
 
     dockerfile: "Dockerfile"
     dockerdir: "docker"
     arch_tag: ""
+    extra_build_args: ""
 
     # This is the dockerhub repo the image will be pushed to as
     # 'opnfv/{dockerrepo}. See: DOCKER_REPO_NAME parameter.
@@ -61,6 +57,18 @@
           dockerdir: 'docker/barometer-collectd'
           <<: *master
           <<: *other-receivers
+      - 'barometer-collectd-experimental':
+          project: 'barometer'
+          dockerdir: '.'
+          dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'barometer-collectd-latest':
+          project: 'barometer'
+          dockerdir: '.'
+          dockerfile: 'docker/barometer-collectd-latest/Dockerfile'
+          <<: *master
+          <<: *other-receivers
       - 'barometer-dma':
           project: 'barometer'
           dockerdir: 'docker/barometer-dma'
@@ -91,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
@@ -197,33 +113,28 @@
           dockerfile: 'Dockerfile.web'
           <<: *master
           <<: *other-receivers
+      - 'dovetail-webportal-web-onap':
+          project: 'dovetail-webportal'
+          dockerfile: 'Dockerfile.web'
+          extra_build_args: 'CONTAINER=onap GUI=onap-ui'
+          <<: *master
+          <<: *other-receivers
       - 'nfvbench':
           project: 'nfvbench'
           <<: *master
           <<: *other-receivers
-      - 'pharos-tools-laas-dashboard':
-          project: 'pharos-tools'
-          dockerdir: 'dashboard'
+      - 'laas-dashboard':
+          project: 'laas'
+          dockerdir: '.'
           dockerfile: 'web/Dockerfile'
           <<: *master
-          <<: *pharos_tools_receivers
-      - 'pharos-tools-laas-celery':
-          project: 'pharos-tools'
-          dockerdir: 'dashboard'
-          dockerfile: 'worker/Dockerfile'
-          <<: *master
-          <<: *pharos_tools_receivers
-      - 'qtip':
-          project: 'qtip'
+          <<: *laas_receivers
+      - 'laas-celery':
+          project: 'laas'
           dockerdir: '.'
-          dockerfile: 'docker/Dockerfile.local'
-          <<: *master
-          <<: *other-receivers
-      - 'qtip-nettest':
-          project: 'qtip'
-          dockerdir: 'contrib/nettest'
+          dockerfile: 'worker/Dockerfile'
           <<: *master
-          <<: *other-receivers
+          <<: *laas_receivers
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
@@ -254,163 +165,115 @@
           arch_tag: 'x86_64'
           <<: *master
           <<: *storperf-receivers
-      - 'yardstick':
-          project: 'yardstick'
+      - 'storperf-workloadagent':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-workloadagent'
+          arch_tag: 'x86_64'
           <<: *master
-          <<: *yardstick-receivers
-      - 'yardstick-image-k8s':
-          project: 'yardstick'
-          dockerdir: 'docker/k8s'
+          <<: *storperf-receivers
+      - 'rapid':
+          project: 'samplevnf'
+          dockerdir: 'VNFs/DPPD-PROX/helper-scripts/rapid'
           <<: *master
-          <<: *yardstick-receivers
+          <<: *samplevnf-receivers
 
-      # projects with jobs for euphrates
-      - 'barometer-dma':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-dma'
-          <<: *gambia
-          <<: *other-receivers
-      - 'barometer-collectd':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-collectd'
-          <<: *gambia
-          <<: *other-receivers
-      - 'barometer-grafana':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-grafana'
-          <<: *gambia
-          <<: *other-receivers
-      - 'barometer-influxdb':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-influxdb'
-          <<: *gambia
-          <<: *other-receivers
-      - 'barometer-kafka':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-kafka'
-          <<: *gambia
-          <<: *other-receivers
-      - 'barometer-ves':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-ves'
-          <<: *gambia
-          <<: *other-receivers
-      - 'barometer-snmp':
-          project: 'barometer'
-          dockerdir: 'docker/barometer-snmp'
-          <<: *gambia
-          <<: *other-receivers
-      - 'bottlenecks':
-          project: 'bottlenecks'
-          <<: *euphrates
-          <<: *other-receivers
-      - 'nfvbench':
-          project: 'nfvbench'
-          <<: *fraser
-          <<: *other-receivers
-      - 'qtip':
-          project: 'qtip'
-          dockerdir: '.'
-          dockerfile: 'docker/Dockerfile.local'
-          <<: *fraser
+      # projects with jobs for hunter
+      - 'dovetail':
+          project: 'dovetail'
+          <<: *hunter
           <<: *other-receivers
+
+      # projects with jobs for iruya
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
           arch_tag: 'x86_64'
-          <<: *gambia
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-graphite':
           project: 'storperf'
           dockerdir: 'docker/storperf-graphite'
           arch_tag: 'x86_64'
-          <<: *gambia
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-httpfrontend':
           project: 'storperf'
           dockerdir: 'docker/storperf-httpfrontend'
           arch_tag: 'x86_64'
-          <<: *gambia
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-reporting':
           project: 'storperf'
           dockerdir: 'docker/storperf-reporting'
           arch_tag: 'x86_64'
-          <<: *gambia
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-swaggerui':
           project: 'storperf'
           dockerdir: 'docker/storperf-swaggerui'
           arch_tag: 'x86_64'
-          <<: *gambia
+          <<: *iruya
           <<: *storperf-receivers
-      - 'yardstick':
-          project: 'yardstick'
-          <<: *gambia
-          <<: *yardstick-receivers
-      # projects with jobs for fraser
-      - 'bottlenecks':
-          project: 'bottlenecks'
-          <<: *fraser
+      - 'storperf-workloadagent':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-workloadagent'
+          arch_tag: 'x86_64'
+          <<: *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
-      - 'clover':
-          project: 'clover'
+      - 'barometer-collectd-latest':
+          project: 'barometer'
           dockerdir: '.'
-          dockerfile: 'docker/Dockerfile'
-          <<: *fraser
+          dockerfile: 'docker/barometer-collectd-latest/Dockerfile'
+          <<: *jerma
           <<: *other-receivers
-      - 'clover-ns-nginx-lb':
-          project: 'clover'
-          dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'subservices/lb/Dockerfile'
-          <<: *fraser
+      - 'barometer-dma':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-dma'
+          <<: *jerma
           <<: *other-receivers
-      - 'clover-ns-nginx-proxy':
-          project: 'clover'
-          dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'subservices/proxy/Dockerfile'
-          <<: *fraser
+      - 'barometer-grafana':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-grafana'
+          <<: *jerma
+          <<: *other-receivers
+      - 'barometer-influxdb':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-influxdb'
+          <<: *jerma
           <<: *other-receivers
-      - 'clover-ns-nginx-server':
-          project: 'clover'
-          dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'subservices/server/Dockerfile'
-          <<: *fraser
+      - 'barometer-kafka':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-kafka'
+          <<: *jerma
           <<: *other-receivers
-      - 'clover-ns-snort-ids':
-          project: 'clover'
-          dockerdir: 'samples/services/snort_ids/docker'
-          dockerfile: 'Dockerfile'
-          <<: *fraser
+      - 'barometer-ves':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-ves'
+          <<: *jerma
           <<: *other-receivers
-      - 'dovetail':
-          project: 'dovetail'
-          <<: *fraser
+      - '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: ""
-
-    project:
-      # projects with jobs for master
-      - 'daisy':
-          dockerrepo: 'daisy'
-          <<: *master
-      - 'escalator':
-          dockerrepo: 'escalator'
-          <<: *master
-
-    jobs:
-      - '{project}-docker-build-push-monitor-{stream}'
-
 ########################
 # job templates
 ########################
@@ -452,6 +315,10 @@
           name: ARCH_TAG
           default: "{arch_tag}"
           description: "If set, this value will be added to the docker image tag as a prefix"
+      - string:
+          name: EXTRA_BUILD_ARGS
+          default: "{extra_build_args}"
+          description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image"
 
     properties:
       - throttle:
@@ -475,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/**'