Merge "Fix dcc213d ('max-git-repo-age-hours' behaviour)"

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index b3c72a2..75014db 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 4e579b6..e53c061 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -54,3 +54,24 @@
       - gerrit-info-yaml-verify
     project: dcaegen2/utils
     branch: master
+
+- project:
+    name: dcaegen2-platform-cbs-client
+    # jenkins job prefix
+    project-name: '{name}'
+    # git repo
+    project: dcaegen2/utils
+    # push credentials
+    mvn-settings: dcaegen2-utils-settings
+    # requires centos to sign release
+    build-node: centos7-builder-2c-1g
+    # subdirectory
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'onap-dcae-cbs-docker-client/{name}/.*'
+    tox-dir: onap-dcae-cbs-docker-client
+    jobs:
+      - '{project-name}-gerrit-pypi-jobs'
+    stream:
+      - master:
+          branch: master

diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index 5a6417f..a2933fb 100644 (file)
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -20,5 +20,5 @@
     project-name: offline-installer
     jobs:
       - gerrit-info-yaml-verify
-    project: offline-installer
+    project: oom/offline-installer
     branch: master