diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 820c260c7daf19cbd7e98e0d99cfb0788c21c349..11c21b7b424ec5e0643b7793685744c3b487f8de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -380,6 +380,15 @@ update_values: git status git push -f "https://${GITLAB_USER_NAME}:${GROUP_ACCESS_TOKEN}@labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.ops/installer.git" HEAD:develop + + git checkout gitops-cd + git pull origin gitops-cd + git fetch origin develop + git merge origin/develop -m "Merge changes from develop" + + git status + git push -f "https://${GITLAB_USER_NAME}:${GROUP_ACCESS_TOKEN}@labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.ops/installer.git" HEAD:gitops-cd + else echo "No changes to commit." fi