Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Andreas Tsagkaropoulos
morphemic-preprocessor
Commits
bff9a8ba
Commit
bff9a8ba
authored
Mar 16, 2021
by
Mohamed Khalil Labidi
Browse files
Fix empty communication and script tasks building
parent
b7d200ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/activeeon/morphemic/PAGateway.java
View file @
bff9a8ba
...
...
@@ -85,13 +85,15 @@ public class PAGateway {
private
List
<
Port
>
extractListOfPortsToOpen
(
JSONArray
ports
)
{
List
<
Port
>
portsToOpen
=
new
LinkedList
<>();
ports
.
forEach
(
object
->
{
JSONObject
portEntry
=
(
JSONObject
)
object
;
if
(
Objects
.
equals
(
"PortProvided"
,
portEntry
.
optString
(
"type"
)))
{
Port
portToOpen
=
new
Port
(
portEntry
.
optInt
(
"port"
));
portsToOpen
.
add
(
portToOpen
);
}
});
if
(
ports
!=
null
)
{
ports
.
forEach
(
object
->
{
JSONObject
portEntry
=
(
JSONObject
)
object
;
if
(
Objects
.
equals
(
"PortProvided"
,
portEntry
.
optString
(
"type"
)))
{
Port
portToOpen
=
new
Port
(
portEntry
.
optInt
(
"port"
));
portsToOpen
.
add
(
portToOpen
);
}
});
}
return
portsToOpen
;
}
...
...
@@ -125,15 +127,18 @@ public class PAGateway {
private
List
<
String
>
extractParentTasks
(
JSONObject
job
,
JSONObject
task
)
{
List
<
String
>
parentTasks
=
new
LinkedList
<>();
task
.
optJSONArray
(
"ports"
).
forEach
(
portObject
->
{
JSONObject
portEntry
=
(
JSONObject
)
portObject
;
if
(
Objects
.
equals
(
"PortRequired"
,
portEntry
.
optString
(
"type"
))
&&
portEntry
.
optBoolean
(
"isMandatory"
))
{
LOGGER
.
debug
(
"Mandatory required port detected"
);
String
providedPortName
=
findProvidedPort
(
job
,
portEntry
.
optString
(
"name"
));
parentTasks
.
add
(
findTaskByProvidedPort
(
job
.
optJSONArray
(
"tasks"
),
providedPortName
));
}
});
JSONArray
ports
=
task
.
optJSONArray
(
"ports"
);
if
(
ports
!=
null
)
{
ports
.
forEach
(
portObject
->
{
JSONObject
portEntry
=
(
JSONObject
)
portObject
;
if
(
Objects
.
equals
(
"PortRequired"
,
portEntry
.
optString
(
"type"
))
&&
portEntry
.
optBoolean
(
"isMandatory"
))
{
LOGGER
.
debug
(
"Mandatory required port detected"
);
String
providedPortName
=
findProvidedPort
(
job
,
portEntry
.
optString
(
"name"
));
parentTasks
.
add
(
findTaskByProvidedPort
(
job
.
optJSONArray
(
"tasks"
),
providedPortName
));
}
});
}
return
parentTasks
;
}
...
...
@@ -586,7 +591,14 @@ public class PAGateway {
if
(!(
task
.
getInstallation
().
getInstall
().
isEmpty
()
&&
task
.
getInstallation
().
getPreInstall
().
isEmpty
()
&&
task
.
getInstallation
().
getPostInstall
().
isEmpty
()))
{
scriptTaskInstall
=
PAFactory
.
createBashScriptTask
(
task
.
getName
()
+
"_install"
+
taskNameSuffix
,
task
.
getInstallation
().
getInstall
());
if
(!
task
.
getInstallation
().
getInstall
().
isEmpty
())
{
scriptTaskInstall
=
PAFactory
.
createBashScriptTask
(
task
.
getName
()
+
"_install"
+
taskNameSuffix
,
task
.
getInstallation
().
getInstall
());
}
else
{
scriptTaskInstall
=
PAFactory
.
createBashScriptTask
(
task
.
getName
()
+
"_install"
+
taskNameSuffix
,
"echo \"Installation script is empty. Nothing to be executed.\""
);
}
if
(!
task
.
getInstallation
().
getPreInstall
().
isEmpty
())
{
scriptTaskInstall
.
setPreScript
(
PAFactory
.
createSimpleScript
(
task
.
getInstallation
().
getPreInstall
(),
"bash"
));
}
...
...
@@ -600,7 +612,14 @@ public class PAGateway {
if
(!(
task
.
getInstallation
().
getStart
().
isEmpty
()
&&
task
.
getInstallation
().
getPreStart
().
isEmpty
()
&&
task
.
getInstallation
().
getPostStart
().
isEmpty
()))
{
scriptTaskStart
=
PAFactory
.
createBashScriptTask
(
task
.
getName
()
+
"_start"
+
taskNameSuffix
,
task
.
getInstallation
().
getStart
());
if
(!
task
.
getInstallation
().
getStart
().
isEmpty
())
{
scriptTaskStart
=
PAFactory
.
createBashScriptTask
(
task
.
getName
()
+
"_start"
+
taskNameSuffix
,
task
.
getInstallation
().
getStart
());
}
else
{
scriptTaskStart
=
PAFactory
.
createBashScriptTask
(
task
.
getName
()
+
"_start"
+
taskNameSuffix
,
"echo \"Installation script is empty. Nothing to be executed.\""
);
}
if
(!
task
.
getInstallation
().
getPreStart
().
isEmpty
())
{
scriptTaskStart
.
setPreScript
(
PAFactory
.
createSimpleScript
(
task
.
getInstallation
().
getPreStart
(),
"bash"
));
}
...
...
src/main/resources/wait_for_lock_script.sh
View file @
bff9a8ba
...
...
@@ -6,4 +6,6 @@ while [ `ps aux | grep [l]ock_is_held | wc -l` != 0 ]; do
((
i
=
i+10
))
;
done
echo
"Exited the while loop, time spent:
$i
"
ps aux |
grep
[
a]pt
\ No newline at end of file
echo
"ps aux | grep apt"
ps aux |
grep
apt
echo
"Waiting for lock task ended properly."
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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