X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fopnfv-docker.yaml;h=85ddbf09ea95fbe4979b20cfe931db96c2c67d39;hb=130035b670054a9486331a0ed8e396ed82623a20;hp=47c3ce4b864c0f2d573a199db9a21e34bc7a8693;hpb=c04f88ca91b7612c70bcae9c8a70a98d5bd46c6e;p=releng.git diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 47c3ce4b8..85ddbf09e 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -11,32 +11,27 @@ stream: master branch: '{stream}' disabled: false - danube: &danube - stream: danube - branch: 'stable/{stream}' - disabled: false - euphrates: &euphrates - stream: euphrates - branch: 'stable/{stream}' - disabled: false - fraser: &fraser - stream: fraser + hunter: &hunter + stream: hunter branch: 'stable/{stream}' disabled: false + pharos-tools-receivers: &pharos_tools_receivers + receivers: > + pberberian@iol.unh.edu + sbergeron@iol.unh.edu storperf-receivers: &storperf-receivers receivers: > mark.beierl@emc.com yardstick-receivers: &yardstick-receivers receivers: > - limingjiang@huawei.com rexlee8776@gmail.com - emma.l.foley@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. @@ -53,6 +48,17 @@ dockerdir: 'docker/barometer-collectd' <<: *master <<: *other-receivers + - 'barometer-collectd-master': + project: 'barometer' + dockerdir: '.' + dockerfile: 'docker/barometer-collectd-master/Dockerfile' + <<: *master + <<: *other-receivers + - 'barometer-dma': + project: 'barometer' + dockerdir: 'docker/barometer-dma' + <<: *master + <<: *other-receivers - 'barometer-grafana': project: 'barometer' dockerdir: 'docker/barometer-grafana' @@ -112,12 +118,60 @@ 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 @@ -136,10 +190,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' + 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' dockerdir: '.' @@ -185,130 +257,97 @@ 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 euphrates + # projects with jobs for hunter + - 'barometer-dma': + project: 'barometer' + dockerdir: 'docker/barometer-dma' + <<: *hunter + <<: *other-receivers - 'barometer-collectd': project: 'barometer' dockerdir: 'docker/barometer-collectd' - <<: *fraser + <<: *hunter + <<: *other-receivers + - 'barometer-collectd-master': + project: 'barometer' + dockerdir: '.' + dockerfile: 'docker/barometer-collectd-master/Dockerfile' + <<: *hunter <<: *other-receivers - 'barometer-grafana': project: 'barometer' dockerdir: 'docker/barometer-grafana' - <<: *fraser + <<: *hunter <<: *other-receivers - 'barometer-influxdb': project: 'barometer' dockerdir: 'docker/barometer-influxdb' - <<: *fraser + <<: *hunter <<: *other-receivers - 'barometer-kafka': project: 'barometer' dockerdir: 'docker/barometer-kafka' - <<: *fraser + <<: *hunter <<: *other-receivers - 'barometer-ves': project: 'barometer' dockerdir: 'docker/barometer-ves' - <<: *fraser + <<: *hunter <<: *other-receivers - 'barometer-snmp': project: 'barometer' dockerdir: 'docker/barometer-snmp' - <<: *fraser + <<: *hunter <<: *other-receivers - 'bottlenecks': project: 'bottlenecks' - <<: *euphrates - <<: *other-receivers - - 'nfvbench': - project: 'nfvbench' - <<: *fraser - <<: *other-receivers - - 'qtip': - project: 'qtip' - dockerdir: '.' - dockerfile: 'docker/Dockerfile.local' - <<: *fraser + <<: *hunter <<: *other-receivers - 'storperf-master': project: 'storperf' dockerdir: 'docker/storperf-master' arch_tag: 'x86_64' - <<: *fraser + <<: *hunter <<: *storperf-receivers - 'storperf-graphite': project: 'storperf' dockerdir: 'docker/storperf-graphite' arch_tag: 'x86_64' - <<: *fraser + <<: *hunter <<: *storperf-receivers - 'storperf-httpfrontend': project: 'storperf' dockerdir: 'docker/storperf-httpfrontend' arch_tag: 'x86_64' - <<: *fraser + <<: *hunter <<: *storperf-receivers - 'storperf-reporting': project: 'storperf' dockerdir: 'docker/storperf-reporting' arch_tag: 'x86_64' - <<: *fraser + <<: *hunter <<: *storperf-receivers - 'storperf-swaggerui': project: 'storperf' dockerdir: 'docker/storperf-swaggerui' arch_tag: 'x86_64' - <<: *fraser + <<: *hunter <<: *storperf-receivers - 'yardstick': project: 'yardstick' - <<: *fraser - <<: *other-receivers - # projects with jobs for fraser - - 'bottlenecks': - project: 'bottlenecks' - <<: *fraser - <<: *other-receivers - - 'clover': - project: 'clover' - dockerdir: '.' - dockerfile: 'docker/Dockerfile' - <<: *fraser - <<: *other-receivers - - 'clover-ns-nginx-lb': - project: 'clover' - dockerdir: 'samples/services/nginx/docker' - dockerfile: 'subservices/lb/Dockerfile' - <<: *fraser - <<: *other-receivers - - 'clover-ns-nginx-proxy': - project: 'clover' - dockerdir: 'samples/services/nginx/docker' - dockerfile: 'subservices/proxy/Dockerfile' - <<: *fraser - <<: *other-receivers - - 'clover-ns-nginx-server': - project: 'clover' - dockerdir: 'samples/services/nginx/docker' - dockerfile: 'subservices/server/Dockerfile' - <<: *fraser - <<: *other-receivers - - 'clover-ns-snort-ids': - project: 'clover' - dockerdir: 'samples/services/snort_ids/docker' - dockerfile: 'Dockerfile' - <<: *fraser - <<: *other-receivers - - 'dovetail': - project: 'dovetail' - <<: *fraser - <<: *other-receivers + <<: *hunter + <<: *yardstick-receivers # yamllint enable rule:key-duplicates jobs: - "{dockerrepo}-docker-build-push-{stream}" @@ -320,15 +359,13 @@ dockerfile: "Dockerfile" dockerdir: "docker" arch_tag: "" + extra_build_args: "" project: # projects with jobs for master - 'daisy': dockerrepo: 'daisy' <<: *master - - 'escalator': - dockerrepo: 'escalator' - <<: *master jobs: - '{project}-docker-build-push-monitor-{stream}' @@ -374,6 +411,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: