Merge "Remove specific Jenkins job from template"

diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index 9ebc0dd..9b8a028 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -10,7 +10,6 @@
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-daily'
       - '{project-name}-{stream}-docker-version-java-daily'
-      - '{project-name}-docker-image-blessing'
     project: 'dmaap/messagerouter/messageservice'
     stream:
       - 'master':

diff --git a/jjb/global-jjb b/jjb/global-jjb
index 633d8e3..21f2869 160000 (submodule)
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit 633d8e37f1796d6a1be9c3e5ad85f0322622fe64
+Subproject commit 21f2869c8f8ac7b2b21130eb16231a8df2904f5c

diff --git a/jjb/oom/oneclick-config-build-docker-image.sh b/jjb/oom/oneclick-config-build-docker-image.sh
new file mode 100644 (file)
index 0000000..2cee98f
--- /dev/null
+++ b/jjb/oom/oneclick-config-build-docker-image.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+echo '========= CALLING SCRIPT TO BUILD ONECLICK CONFIG TAR FILE ========='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+cd kubernetes/config/docker/init
+
+chmod 755 *.*
+
+docker build

diff --git a/jjb/oom/oneclick-config-make-tar.sh b/jjb/oom/oneclick-config-make-tar.sh
new file mode 100644 (file)
index 0000000..da2da20
--- /dev/null
+++ b/jjb/oom/oneclick-config-make-tar.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+echo '========= CALLING SCRIPT TO BUILD ONECLICK CONFIG TAR FILE ========='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+cd kubernetes/config/docker/init
+
+chmod 755 *.*
+
+./make-tar.sh

diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml
new file mode 100644 (file)
index 0000000..be79462
--- /dev/null
+++ b/jjb/oom/oom-oneclick-config.yaml
@@ -0,0 +1,42 @@
+---
+- project:
+   name: oomconfig
+   project-name: 'oomconfig'
+   project: 'oom'
+
+   files: '**'
+   archive-artifacts: ''
+   build-timeout: 60
+   build-node: ubuntu1604-docker-8c-8g
+   submodule-recursive: true
+
+   jobs:
+     - '{project}-{stream}-release-config'
+   stream:
+     - 'master':
+         branch: 'master'
+
+- job-template:
+    name: '{project}-{stream}-release-config'
+    project-type: freestyle
+    node: '{build-node}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: 14
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: 'refs/heads/master'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - docker-login
+      - shell: !include-raw-escape: oneclick-config-make-tar.sh
+      - shell: !include-raw-escape: oneclick-config-build-docker-image.sh
+      - shell: !include-raw-escape: ../include-docker-push.sh