Merge "Run rebase jobs on a daily basis"

diff --git a/jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml b/jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml
index ae291c2aa9dff0c739b0e3601a96156ed97a7609..dc936b90b100e2732da58d8bce4df0daf7fd2875 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml
+++ b/jjb/dmaap/dmaap-datarouter-push-upstream-jobs.yaml
@@ -25,6 +25,8 @@
     stream:
       - master:
           branch: '{stream}'
+      - casablanca:
+          branch: '{stream}'
 
     jobs:
       - '{project-name}-{stream}-push-upstream'

diff --git a/jjb/dmaap/dmaap-datarouter-rebase-jobs.yaml b/jjb/dmaap/dmaap-datarouter-rebase-jobs.yaml
index 4ce649b373a79e07a23b111e70e62d2eda42aad4..ce8645b602cabacfd643e17e540abae8a5ed52af 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter-rebase-jobs.yaml
+++ b/jjb/dmaap/dmaap-datarouter-rebase-jobs.yaml
@@ -26,5 +26,8 @@
     stream:
       - master:
           branch: '{stream}'
+      - casablanca:
+          branch: '{stream}'
+
     jobs:
       - '{project-name}-{stream}-rebase'

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index dd5f73da689cf737513d576428e5a3cf600e23c2..a12398420076fc4e5546baaa3801d437604ce402 100644 (file)
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -233,7 +233,6 @@
       - slack:
           room: '{slack-channel}'
           notify-failure: True
-          notify-back-to-normal: True
 
 # property to discard old builds
 - property:

diff --git a/jjb/global/push-upstream-jobs.sh b/jjb/global/push-upstream-jobs.sh
index 492071c5086d0d848de0e40934052b9fb667f88d..49af36e76eeb92801afa401140a22f080e236d9b 100755 (executable)
--- a/jjb/global/push-upstream-jobs.sh
+++ b/jjb/global/push-upstream-jobs.sh
@@ -46,7 +46,7 @@ git config user.name $username
 
 echo "Checking out branch on master with new changes"
 git reset HEAD~1 --soft
-git checkout -b delivery_branch origin/master
+git checkout -b delivery_branch origin/$BRANCH
 
 git config --get remote.upstream.url
 retVal=$?

diff --git a/jjb/integration/integration-csit-push-upstream-jobs.yaml b/jjb/integration/integration-csit-push-upstream-jobs.yaml
index 8b394c5d8441b0fee7cf17d8c96e53d7ce2ffb5c..54a8edb9a82d6a6d90f57b6968cdc7e09d5c9545 100644 (file)
--- a/jjb/integration/integration-csit-push-upstream-jobs.yaml
+++ b/jjb/integration/integration-csit-push-upstream-jobs.yaml
@@ -25,6 +25,8 @@
     stream:
       - master:
           branch: '{stream}'
+      - casablanca:
+          branch: '{stream}'
 
     jobs:
       - '{project-name}-{stream}-push-upstream'

diff --git a/jjb/integration/integration-csit-rebase-jobs.yaml b/jjb/integration/integration-csit-rebase-jobs.yaml
index 7499efb1c0f484bdfe51332a6275095376cadc33..cdfdc3aa823e37c8c05e693f6a34f89b743dfeef 100644 (file)
--- a/jjb/integration/integration-csit-rebase-jobs.yaml
+++ b/jjb/integration/integration-csit-rebase-jobs.yaml
@@ -27,5 +27,8 @@
     stream:
       - master:
           branch: '{stream}'
+      - casablanca:
+          branch: '{stream}'
+
     jobs:
       - '{project-name}-{stream}-rebase'
\ No newline at end of file

diff --git a/jjb/integration/integration-push-upstream-jobs.yaml b/jjb/integration/integration-push-upstream-jobs.yaml
index 631d8bcaa72cc24b91764f2f504ddcd3511fc663..5edaaa7b75abefa870b00c07cd896c3336f3280c 100644 (file)
--- a/jjb/integration/integration-push-upstream-jobs.yaml
+++ b/jjb/integration/integration-push-upstream-jobs.yaml
@@ -25,6 +25,8 @@
     stream:
       - master:
           branch: '{stream}'
+      - casablanca:
+          branch: '{stream}'
 
     jobs:
       - '{project-name}-{stream}-push-upstream'

diff --git a/jjb/integration/integration-rebase-jobs.yaml b/jjb/integration/integration-rebase-jobs.yaml
index ec4482895f9c0608433dedec64832758f12dc4fb..78cbb3a9f4dc39ffd00d79e3707548f1cdc87609 100644 (file)
--- a/jjb/integration/integration-rebase-jobs.yaml
+++ b/jjb/integration/integration-rebase-jobs.yaml
@@ -27,5 +27,8 @@
     stream:
       - master:
           branch: '{stream}'
+      - casablanca:
+          branch: '{stream}'
+
     jobs:
       - '{project-name}-{stream}-rebase'
\ No newline at end of file