TT#63758 TT#55162 Fix tests after migration to group 'ngcp-admin'

The commit 92dccb4b10 introduced new group 'ngcp-admin'
and forced ngcpcfg to set proper perms every time we call ngcpcfg.

One of the tests starts failing right after the commit above, but
we didn't notice it until we add error message (the following commit).

Wihtout the fix here ngcpcfg doesn't pass tests:

> test_ngcpcfg_build_network_interfaces.py::test_network_interfaces FAILED
> ...
> stderr:
> b"../scripts//build: line 174: CONFIG_GROUP: unbound variable
> 2019-10-01 15:41:35 b22fa4d1cbb9: Error: Failed to call action 'build' on 'b22fa4d1cbb9' (see logs on 'b22fa4d1cbb9')

Change-Id: Ia514a7e275aef25d01bdaedf71ef7879e84dd8ba
changes/62/33862/3
Alexander Lutay 7 years ago
parent 90b1ff6b6c
commit 3b3c4a1f1a

@ -34,4 +34,16 @@
# validate configs using kwalify schema
[ -n "${VALIDATE_SCHEMA:-}" ] || VALIDATE_SCHEMA="false"
# file ownership and permissions for YML files
[ -n "${CONFIG_USER:-}" ] || CONFIG_USER="root"
[ -n "${CONFIG_GROUP:-}" ] || CONFIG_GROUP="_ngcp-admin"
[ -n "${CONFIG_CHMOD:-}" ] || CONFIG_CHMOD="0660"
[ -n "${CONSTANTS_CONFIG_USER:-}" ] || CONSTANTS_CONFIG_USER="root"
[ -n "${CONSTANTS_CONFIG_GROUP:-}" ] || CONSTANTS_CONFIG_GROUP="root"
[ -n "${CONSTANTS_CONFIG_CHMOD:-}" ] || CONSTANTS_CONFIG_CHMOD="0600"
[ -n "${NETWORK_CONFIG_USER:-}" ] || NETWORK_CONFIG_USER="root"
[ -n "${NETWORK_CONFIG_GROUP:-}" ] || NETWORK_CONFIG_GROUP="_ngcp-admin"
[ -n "${NETWORK_CONFIG_CHMOD:-}" ] || NETWORK_CONFIG_CHMOD="0660"
## END OF FILE #################################################################

@ -34,4 +34,16 @@
# validate configs using kwalify schema
[ -n "${VALIDATE_SCHEMA:-}" ] || VALIDATE_SCHEMA="false"
# file ownership and permissions for YML files
[ -n "${CONFIG_USER:-}" ] || CONFIG_USER="root"
[ -n "${CONFIG_GROUP:-}" ] || CONFIG_GROUP="_ngcp-admin"
[ -n "${CONFIG_CHMOD:-}" ] || CONFIG_CHMOD="0660"
[ -n "${CONSTANTS_CONFIG_USER:-}" ] || CONSTANTS_CONFIG_USER="root"
[ -n "${CONSTANTS_CONFIG_GROUP:-}" ] || CONSTANTS_CONFIG_GROUP="root"
[ -n "${CONSTANTS_CONFIG_CHMOD:-}" ] || CONSTANTS_CONFIG_CHMOD="0600"
[ -n "${NETWORK_CONFIG_USER:-}" ] || NETWORK_CONFIG_USER="root"
[ -n "${NETWORK_CONFIG_GROUP:-}" ] || NETWORK_CONFIG_GROUP="_ngcp-admin"
[ -n "${NETWORK_CONFIG_CHMOD:-}" ] || NETWORK_CONFIG_CHMOD="0660"
## END OF FILE #################################################################

@ -34,4 +34,16 @@
# validate configs using kwalify schema
[ -n "${VALIDATE_SCHEMA:-}" ] || VALIDATE_SCHEMA="false"
# file ownership and permissions for YML files
[ -n "${CONFIG_USER:-}" ] || CONFIG_USER="root"
[ -n "${CONFIG_GROUP:-}" ] || CONFIG_GROUP="_ngcp-admin"
[ -n "${CONFIG_CHMOD:-}" ] || CONFIG_CHMOD="0660"
[ -n "${CONSTANTS_CONFIG_USER:-}" ] || CONSTANTS_CONFIG_USER="root"
[ -n "${CONSTANTS_CONFIG_GROUP:-}" ] || CONSTANTS_CONFIG_GROUP="root"
[ -n "${CONSTANTS_CONFIG_CHMOD:-}" ] || CONSTANTS_CONFIG_CHMOD="0600"
[ -n "${NETWORK_CONFIG_USER:-}" ] || NETWORK_CONFIG_USER="root"
[ -n "${NETWORK_CONFIG_GROUP:-}" ] || NETWORK_CONFIG_GROUP="_ngcp-admin"
[ -n "${NETWORK_CONFIG_CHMOD:-}" ] || NETWORK_CONFIG_CHMOD="0660"
## END OF FILE #################################################################

@ -34,4 +34,16 @@
# validate configs using kwalify schema
[ -n "${VALIDATE_SCHEMA:-}" ] || VALIDATE_SCHEMA="false"
# file ownership and permissions for YML files
[ -n "${CONFIG_USER:-}" ] || CONFIG_USER="root"
[ -n "${CONFIG_GROUP:-}" ] || CONFIG_GROUP="_ngcp-admin"
[ -n "${CONFIG_CHMOD:-}" ] || CONFIG_CHMOD="0660"
[ -n "${CONSTANTS_CONFIG_USER:-}" ] || CONSTANTS_CONFIG_USER="root"
[ -n "${CONSTANTS_CONFIG_GROUP:-}" ] || CONSTANTS_CONFIG_GROUP="root"
[ -n "${CONSTANTS_CONFIG_CHMOD:-}" ] || CONSTANTS_CONFIG_CHMOD="0600"
[ -n "${NETWORK_CONFIG_USER:-}" ] || NETWORK_CONFIG_USER="root"
[ -n "${NETWORK_CONFIG_GROUP:-}" ] || NETWORK_CONFIG_GROUP="_ngcp-admin"
[ -n "${NETWORK_CONFIG_CHMOD:-}" ] || NETWORK_CONFIG_CHMOD="0660"
## END OF FILE #################################################################

@ -20,6 +20,15 @@ def ngcpcfgcli(tmpdir, *args):
'PERL5LIB': '../lib/',
'NGCP_SOCKETFILE': '/tmp/ngcpcfg.socket',
'NGCP_TESTSUITE': 'true',
'CONFIG_USER': 'nobody',
'CONFIG_GROUP': 'root',
'CONFIG_CHMOD': '0755',
'CONSTANTS_CONFIG_USER': 'nobody',
'CONSTANTS_CONFIG_GROUP': 'root',
'CONSTANTS_CONFIG_CHMOD': '0755',
'NETWORK_CONFIG_USER': 'nobody',
'NETWORK_CONFIG_GROUP': 'root',
'NETWORK_CONFIG_CHMOD': '0755'
}
testenv.update(env)

Loading…
Cancel
Save