Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tom Niget
slapos
Commits
3afcf5d7
Commit
3afcf5d7
authored
Sep 14, 2023
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
1fcd08d3
2fddbe1e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
software/erp5testnode/buildout.hash.cfg
software/erp5testnode/buildout.hash.cfg
+1
-1
software/erp5testnode/instance.cfg
software/erp5testnode/instance.cfg
+1
-1
update-rc
update-rc
+4
-4
No files found.
software/erp5testnode/buildout.hash.cfg
View file @
3afcf5d7
...
@@ -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
...
...
software/erp5testnode/instance.cfg
View file @
3afcf5d7
...
@@ -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.3
00
/software/seleniumrunner/software.cfg"],
"software-path-list": ["https://lab.nexedi.com/nexedi/slapos/raw/1.0.3
33
/software/seleniumrunner/software.cfg"],
"keep-log-days": 15
"keep-log-days": 15
}
}
update-rc
View file @
3afcf5d7
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment