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
IML Open Source
Imldeployment
Commits
44524f60
Commit
44524f60
authored
Dec 02, 2022
by
Hahn Axel (hahn)
Browse files
Merge branch '5591-remove-warnings' into 'master'
5591 remove warnings See merge request
!38
parents
f58ddc38
8a56ef2f
Pipeline
#1084
passed with stage
in 5 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
public_html/deployment/classes/build_base.class.php
View file @
44524f60
...
...
@@ -11,6 +11,8 @@ class build_base implements iBuildplugin{
protected
$_sBuildDir
=
false
;
protected
$_sOutfile
=
false
;
protected
$_aPlugininfos
=
false
;
protected
$_sLang
=
"en-en"
;
protected
$_aLang
=
[];
...
...
public_html/deployment/classes/project.class.php
View file @
44524f60
...
...
@@ -647,7 +647,7 @@ class project extends base {
$this
->
getAllPhaseInfos
();
foreach
(
$this
->
_aData
[
"phases"
]
as
$sPhase
=>
$aData
)
{
foreach
(
array_keys
(
$this
->
_aPlaces
)
as
$sPlace
)
{
if
(
array_key_exists
(
$sPlace
,
$aData
)
&&
array_key_exists
(
"version"
,
$aData
[
$sPlace
]))
{
if
(
isset
(
$aData
[
$sPlace
][
"version"
]))
{
$this
->
_aVersions
[
$aData
[
$sPlace
][
"version"
]][]
=
array
(
'phase'
=>
$sPhase
,
'place'
=>
$sPlace
);
}
}
...
...
public_html/deployment/plugins/rollout/awx/rollout_awx.php
View file @
44524f60
...
...
@@ -176,7 +176,7 @@ class rollout_awx extends rollout_base {
// ----- Checks:
$sCmdChecks
=
''
;
if
(
$aConfig
[
'extravars'
]){
if
(
isset
(
$aConfig
[
'extravars'
])
&&
$aConfig
[
'extravars'
]){
$aTmp
=
json_decode
(
$aConfig
[
'extravars'
],
1
);
if
(
!
$aTmp
||
!
is_array
(
$aTmp
)
||
!
count
(
$aTmp
)
){
$sCmdChecks
.
=
'echo "ERROR: Value in extravars has wrong Syntax - this is no JSON: '
.
$aConfig
[
'extravars'
]
.
'"; exit 1; '
;
...
...
@@ -184,14 +184,14 @@ class rollout_awx extends rollout_base {
$aConfig
[
'extravars'
]
=
json_encode
(
$aTmp
);
}
if
(
!
(
int
)
$aConfig
[
'inventory'
]){
if
(
!
isset
(
$aConfig
[
'inventory'
])
||
!
(
int
)
$aConfig
[
'inventory'
]){
$sCmdChecks
.
=
'echo "ERROR: no inventory was given."; exit 1; '
;
}
// ----- Send variables having values only
$aBodyvars
=
array
();
foreach
([
'inventory'
=>
'inventory'
,
'limit'
=>
'limit'
,
'job_tags'
=>
'tags'
,
'extra_vars'
=>
'extravars'
]
as
$sParam
=>
$sVarkey
){
if
(
$aConfig
[
$sVarkey
])
{
if
(
isset
(
$aConfig
[
$sVarkey
])
&&
$aConfig
[
$sVarkey
])
{
$aBodyvars
[
$sParam
]
=
$aConfig
[
$sVarkey
];
}
}
...
...
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