Commit 3afcf5d7 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

Update Release Candidate

parents 1fcd08d3 2fddbe1e
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 9b33c3fc56e6ed68c9dc7f1d5530f67e md5sum = bb4206b61aeba8ce8f848c3bec64e934
[template-default] [template-default]
filename = instance-default.cfg.jinja.in filename = instance-default.cfg.jinja.in
......
...@@ -35,6 +35,6 @@ default-parameters = ...@@ -35,6 +35,6 @@ default-parameters =
"node-quantity": 1, "node-quantity": 1,
"test-suite-master-url": "", "test-suite-master-url": "",
"instance-dict": "", "instance-dict": "",
"software-path-list": ["https://lab.nexedi.com/nexedi/slapos/raw/1.0.300/software/seleniumrunner/software.cfg"], "software-path-list": ["https://lab.nexedi.com/nexedi/slapos/raw/1.0.333/software/seleniumrunner/software.cfg"],
"keep-log-days": 15 "keep-log-days": 15
} }
...@@ -15,17 +15,17 @@ git branch -D 1.0 || echo ...@@ -15,17 +15,17 @@ git branch -D 1.0 || echo
git checkout origin/1.0 -b 1.0 git checkout origin/1.0 -b 1.0
# Reset and Clean # Reset and Clean
git reset --hard origin/1.0 git reset --hard origin/1.0
git clean -f git clean -f
# Merge master # Merge master
git merge origin/master -m "Update Release Candidate" git merge origin/master -m "Update Release Candidate"
# Revert changes from master # Revert changes from master
git diff HEAD..origin/master | git apply git diff HEAD..origin/master | git apply
# Download patch to update revisions based on tests # Download patch to update revisions based on tests
wget -O update-release.sh https://nexedi.erp5.net/portal_skins/custom/TestResultModule_getReleaseCandidateRevision wget -O update-release.sh https://erp5.nexedi.net/portal_skins/custom/TestResultModule_getReleaseCandidateRevision
# Suggestion # Suggestion
...@@ -33,7 +33,7 @@ echo "Review and run ...@@ -33,7 +33,7 @@ echo "Review and run
bash update-release.sh bash update-release.sh
git commit -m 'Update git revisions' -a git commit -m 'Update git revisions' -a
git push origin 1.0 git push origin 1.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment