Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
ecc07135
Commit
ecc07135
authored
Apr 28, 2021
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: better silent and resync optional arguments
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
b234da6a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
13 deletions
+14
-13
ci-scripts/cls_physim1.py
ci-scripts/cls_physim1.py
+11
-10
ci-scripts/sshconnection.py
ci-scripts/sshconnection.py
+3
-3
No files found.
ci-scripts/cls_physim1.py
View file @
ecc07135
...
...
@@ -185,7 +185,7 @@ class PhySim:
count
=
0
while
(
count
<
2
and
isRunning
==
False
):
time
.
sleep
(
60
)
mySSH
.
command
(
'oc get pods -
l app.kubernetes.io/instance=physim'
,
'\$'
,
6
)
mySSH
.
command
(
'oc get pods -
o wide -l app.kubernetes.io/instance=physim | tee -a cmake_targets/log/physim_pods_summary.txt'
,
'\$'
,
6
,
resync
=
True
)
if
mySSH
.
getBefore
().
count
(
'Running'
)
==
12
:
logging
.
debug
(
'
\u001B
[1m Running the physim test Scenarios
\u001B
[0m'
)
isRunning
=
True
...
...
@@ -193,7 +193,7 @@ class PhySim:
count
+=
1
if
isRunning
==
False
:
logging
.
error
(
'
\u001B
[1m Some PODS Running FAILED
\u001B
[0m'
)
mySSH
.
command
(
'oc get pods -l app.kubernetes.io/instance=physim
> cmake_targets/log/physim_pods_summary.txt 2>&1
'
,
'\$'
,
6
)
mySSH
.
command
(
'oc get pods -l app.kubernetes.io/instance=physim
2>&1 | tee -a cmake_targets/log/physim_pods_summary.txt
'
,
'\$'
,
6
)
mySSH
.
command
(
'helm uninstall physim >> cmake_targets/log/physim_helm_summary.txt 2>&1'
,
'\$'
,
6
)
self
.
AnalyzeLogFile_phySim
(
HTML
)
sys
.
exit
(
-
1
)
...
...
@@ -203,9 +203,10 @@ class PhySim:
# doing a deep copy!
tmpPodNames
=
podNames
.
copy
()
while
(
count
<
28
and
isFinished
==
False
):
time
.
sleep
(
60
)
time
.
sleep
(
58
)
for
podName
in
tmpPodNames
:
mySSH
.
command
(
f'oc logs --tail=1
{
podName
}
2>&1'
,
'\$'
,
6
)
mySSH
.
command
(
f'oc logs --tail=1
{
podName
}
2>&1'
,
'\$'
,
6
,
silent
=
True
,
resync
=
True
)
time
.
sleep
(
2
)
if
mySSH
.
getBefore
().
count
(
'FINISHED'
)
!=
0
:
logging
.
debug
(
podName
+
' is finished'
)
tmpPodNames
.
remove
(
podName
)
...
...
@@ -217,7 +218,7 @@ class PhySim:
# Getting the logs of each executables running in individual pods
for
podName
in
podNames
:
mySSH
.
command
(
f'oc logs
{
podName
}
>> cmake_targets/log/physim_test.txt 2>&1'
,
'\$'
,
15
)
mySSH
.
command
(
f'oc logs
{
podName
}
>> cmake_targets/log/physim_test.txt 2>&1'
,
'\$'
,
15
,
resync
=
True
)
time
.
sleep
(
30
)
# UnDeploy the physical simulator pods
...
...
@@ -225,7 +226,7 @@ class PhySim:
isFinished1
=
False
while
(
isFinished1
==
False
):
time
.
sleep
(
20
)
mySSH
.
command
(
'oc get pods -l app.kubernetes.io/instance=physim'
,
'\$'
,
6
)
mySSH
.
command
(
'oc get pods -l app.kubernetes.io/instance=physim'
,
'\$'
,
6
,
resync
=
True
)
if
re
.
search
(
'No resources found'
,
mySSH
.
getBefore
()):
isFinished1
=
True
if
isFinished1
==
True
:
...
...
@@ -249,7 +250,7 @@ class PhySim:
mySSH
.
command
(
'cd '
+
lSourcePath
,
'\$'
,
5
)
mySSH
.
command
(
'cd '
+
lSourcePath
+
'/cmake_targets'
,
'\$'
,
5
)
mySSH
.
command
(
'mkdir -p physim_test_log_'
+
self
.
testCase_id
,
'\$'
,
5
)
mySSH
.
command
(
'
mv log/physim_* '
+
'physim_test_log_'
+
self
.
testCase_id
,
'\$'
,
5
)
mySSH
.
command
(
'
cp log/physim_* '
+
'physim_test_log_'
+
self
.
testCase_id
,
'\$'
,
5
)
if
not
os
.
path
.
exists
(
f'./physim_test_logs_
{
self
.
testCase_id
}
'
):
os
.
mkdir
(
f'./physim_test_logs_
{
self
.
testCase_id
}
'
)
mySSH
.
copyin
(
lIpAddr
,
lUserName
,
lPassWord
,
lSourcePath
+
'/cmake_targets/physim_test_log_'
+
self
.
testCase_id
+
'/*'
,
'./physim_test_logs_'
+
self
.
testCase_id
)
...
...
ci-scripts/sshconnection.py
View file @
ecc07135
...
...
@@ -111,13 +111,13 @@ class SSHConnection():
self
.
sshresponse
=
self
.
ssh
.
expect
(
expected
)
return
self
.
sshresponse
def
command
(
self
,
commandline
,
expectedline
,
timeout
):
if
commandline
.
count
(
'oc logs'
)
==
0
:
def
command
(
self
,
commandline
,
expectedline
,
timeout
,
silent
=
False
,
resync
=
False
):
if
not
silent
:
logging
.
debug
(
commandline
)
self
.
ssh
.
timeout
=
timeout
# Nasty patch when pexpect output is out of sync.
# Much pronounced when running back-to-back-back oc commands
if
(
commandline
.
count
(
'oc logs'
)
>
0
)
or
(
commandline
.
count
(
'oc get'
)
>
0
)
:
if
resync
:
self
.
ssh
.
send
(
commandline
)
self
.
ssh
.
expect
([
commandline
,
pexpect
.
TIMEOUT
])
self
.
ssh
.
send
(
'
\r\n
'
)
...
...
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