Skip to content
Snippets Groups Projects
Commit 38b86f2e authored by Bo-Chun Chen's avatar Bo-Chun Chen
Browse files

Modify steps

Instead of pushing issue branch, and merge on web page
  merging by agent than push master branch to remote
parent 4924e7f8
No related branches found
No related tags found
6 merge requests!147Merge previous default branch feat-cod-rmq into main,!85kill nginx process running under user from login node,!51Fix acct create wait,!39WIP:Feat cod rmq,!38WIP: Feat cod rmq,!21Feat git commit agent
......@@ -50,9 +50,11 @@ def git_commit(ch, method, properties, body):
git.add(cheaha_ldif)
git.add(cheaha_ldapsearch_ldif)
git.commit(m="Added new cheaha user: " + username)
git.push('origin', branch_name)
git.checkout('master')
git.merge(branch_name, '--no-ff', '--no-edit')
git.push('origin', 'master')
success = True
except:
e = sys.exc_info()[0]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment