Add Merge Master into Develop job to CI

[#104050546]

Signed-off-by: Valeria Perticara <[email protected]>

Author: christianang

ci/pipelines/postgres.yml

@@ -6,6 +6,7 @@ groups:
   - test-with-diego
   - delete-deployments
   - create-final-release
+  - merge-master-into-develop
 
 resources:
 - name: cf-release
@@ -48,6 +49,13 @@ resources:
     branch: master
     private_key: {{postgres-release-private-key}}
 
+- name: postgres-release-merge-target
+  type: git
+  source:
+    uri: [email protected]:cloudfoundry/postgres-release.git
+    branch: develop
+    private_key: {{postgres-release-private-key}}
+
 jobs:
 - name: deploy-with-cf
   serial_groups: [cf]
@@ -153,3 +161,20 @@ jobs:
       repository: final-release-repo
       tag: final-release-repo/version_number
       tag_prefix: v
+
+- name: merge-master-into-develop
+  serial_groups: [cf]
+  plan:
+  - aggregate:
+    - get: postgres-release
+      resource: postgres-release-develop
+    - get: release-repo-master
+      resource: postgres-release-master
+      trigger: true
+    - get: release-repo
+      resource: postgres-release-merge-target
+  - task: merge-master-into-develop
+    file: postgres-release/ci/scripts/merge-master-into-develop/task.yml
+  - put: postgres-release-merge-target
+    params:
+      repository: final-release-repo

ci/scripts/merge-master-into-develop/task.sh

@@ -0,0 +1,24 @@
+#!/bin/bash -exu
+
+MERGED_REPO="${PWD}/${MERGED_REPO:?"MERGED_REPO required"}"
+MASTER_BRANCH="${MASTER_BRANCH:-master}"
+
+# Cannot set -u before sourcing .bashrc because of all
+# the unbound variables in things beyond our control.
+set +u
+source ~/.bashrc
+set -u
+
+pushd release-repo > /dev/null
+  git config user.name "CF MEGA BOT"
+  git config user.email "[email protected]"
+
+  git remote add -f master-repo ../release-repo-master
+  git merge --no-edit "master-repo/${MASTER_BRANCH}"
+
+  git status
+  git show --color | cat
+popd > /dev/null
+
+shopt -s dotglob
+cp -R release-repo/* $MERGED_REPO

ci/scripts/merge-master-into-develop/task.yml

@@ -0,0 +1,19 @@
+---
+platform: linux
+
+image: docker:///cfinfrastructure/minimal
+
+inputs:
+  - name: postgres-release
+  - name: release-repo
+  - name: release-repo-master
+
+outputs:
+  - name: final-release-repo
+
+run:
+  path: postgres-release/ci/scripts/merge-master-into-develop/task.sh
+
+params:
+  MASTER_BRANCH:
+  MERGED_REPO: final-release-repo