Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
zzha zzha
OpenXG-RAN
Commits
941acb2e
Commit
941acb2e
authored
Dec 15, 2022
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tag cluster images with branch and commit ID
parent
7361c168
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ci-scripts/cls_cluster.py
ci-scripts/cls_cluster.py
+1
-1
ci-scripts/cls_physim1.py
ci-scripts/cls_physim1.py
+1
-1
No files found.
ci-scripts/cls_cluster.py
View file @
941acb2e
...
...
@@ -214,7 +214,7 @@ class Cluster:
forceBaseImageBuild
=
False
imageTag
=
'develop'
if
self
.
ranAllowMerge
:
# merging MR branch into develop -> temporary image
imageTag
=
'ci-temp
'
imageTag
=
f'
{
self
.
ranBranch
}
-
{
self
.
ranCommitID
[
0
:
8
]
}
'
if
self
.
ranTargetBranch
==
'develop'
:
ret
=
self
.
cmd
.
run
(
f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel8.2 | grep --colour=never -i INDEX'
)
result
=
re
.
search
(
'index'
,
ret
.
stdout
)
...
...
ci-scripts/cls_physim1.py
View file @
941acb2e
...
...
@@ -105,7 +105,7 @@ class PhySim:
if
self
.
ranCommitID
!=
''
:
mySSH
.
command
(
'git checkout -f '
+
self
.
ranCommitID
,
'\$'
,
30
)
if
self
.
ranAllowMerge
:
imageTag
=
"ci-temp"
imageTag
=
f'
{
self
.
ranBranch
}
-
{
self
.
ranCommitID
[
0
:
8
]
}
'
if
self
.
ranTargetBranch
==
''
:
if
(
self
.
ranBranch
!=
'develop'
)
and
(
self
.
ranBranch
!=
'origin/develop'
):
mySSH
.
command
(
'git merge --ff origin/develop -m "Temporary merge for CI"'
,
'\$'
,
30
)
...
...
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