feat(script): enable fast forwarding master
tf-a-main is now working properly in Open-CI environment hence
enabling automated fast forwarding of master upon success of
tf-A-main run.
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
Change-Id: I778f4de9db026a94da9e1c444622c176007a8cc9
diff --git a/script/scratch_scripts/fast-forward-master.sh b/script/scratch_scripts/fast-forward-master.sh
index bbdfa51..4e88cd7 100755
--- a/script/scratch_scripts/fast-forward-master.sh
+++ b/script/scratch_scripts/fast-forward-master.sh
@@ -20,12 +20,7 @@
cd ${clone_dir}
git checkout master
git merge --ff-only origin/integration
-
-# On OpenCI, disable push for now, until we're confident enough we want to do
-# this automatically. See comments in https://linaro.atlassian.net/browse/TFC-223.
-if echo "$JENKINS_URL" | grep -q "oss.arm.com"; then
- git push origin master
-fi
+git push origin master
cd ..
rm -rf ${clone_dir}