Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-AMF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-AMF
Commits
bf6940ae
Commit
bf6940ae
authored
Mar 22, 2021
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: little typos
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
e67d570e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
ci-scripts/Jenkinsfile-GitLab-Docker
ci-scripts/Jenkinsfile-GitLab-Docker
+2
-2
No files found.
ci-scripts/Jenkinsfile-GitLab-Docker
View file @
bf6940ae
...
@@ -133,7 +133,7 @@ pipeline {
...
@@ -133,7 +133,7 @@ pipeline {
sh
"./ci-scripts/doGitLabMerge.sh --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
sh
"./ci-scripts/doGitLabMerge.sh --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
sh
"sleep 10"
sh
"sleep 10"
amf_tag
=
"ci-tmp"
amf_tag
=
"ci-tmp"
rhel_amf_tag
=
'ci-t
emp-pr-'
+
env
.
gitlabMergeRequestI
d
+
'-'
+
shortenShaOne
rhel_amf_tag
=
'ci-t
mp-pr-'
+
env
.
gitlabMergeRequestIi
d
+
'-'
+
shortenShaOne
amf_branch
=
env
.
gitlabSourceBranch
amf_branch
=
env
.
gitlabSourceBranch
echo
"MR TAG is ${rhel_amf_tag}"
echo
"MR TAG is ${rhel_amf_tag}"
}
else
{
}
else
{
...
@@ -400,7 +400,7 @@ pipeline {
...
@@ -400,7 +400,7 @@ pipeline {
}
}
try
{
try
{
if
(
"MERGE"
.
equals
(
env
.
gitlabActionType
))
{
if
(
"MERGE"
.
equals
(
env
.
gitlabActionType
))
{
myShCmd
(
'sudo podman image rm oai-amf:ci-t
e
mp'
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
myShCmd
(
'sudo podman image rm oai-amf:ci-tmp'
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
echo
"We failed to delete the OAI-AMF temp image"
echo
"We failed to delete the OAI-AMF temp image"
...
...
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