Add initial_data for restore pipeline
The 'Backupjinja restore pipeline' job requests to
dogtag:server:initial_data if 'RESTORE_DOGTAG' flag
is enabled in parameters. But that field was missed
in dogtag salt-formulas, so we should add it.
Fix tests
Related-Prod: PROD-33909
Change-Id: Icf6abbf036e029ad4adba1cd44f09cd7845437c3
diff --git a/metadata/service/server/cluster/init.yml b/metadata/service/server/cluster/init.yml
index 8cb702c..7ac0a87 100644
--- a/metadata/service/server/cluster/init.yml
+++ b/metadata/service/server/cluster/init.yml
@@ -10,6 +10,10 @@
dogtag:
server:
enabled: True
+ initial_data:
+ home_dir: /srv/volumes/backup/backupninja
+ host: ${_param:dogtag_master_host}
+ source: ${_param:backupninja_backup_host}
default_config_options:
pki_client_pkcs12_password: ${_param:dogtag_pki_client_pkcs12_password}
subsystems:
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 9761585..4af18a6 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -37,9 +37,13 @@
setup_virtualenv() {
log_info "Setting up Python virtualenv"
+ dependency_check virtualenv
virtualenv $VENV_DIR
source ${VENV_DIR}/bin/activate
python -m pip install salt${PIP_SALT_VERSION}
+ if [[ -f ${CURDIR}/test-requirements.txt ]]; then
+ python -m pip install -r ${CURDIR}/test-requirements.txt
+ fi
}
setup_mock_bin() {
@@ -165,6 +169,13 @@
done
}
+dependency_check() {
+ local DEPENDENCY_COMMANDS=$*
+ for DEPENDENCY_COMMAND in $DEPENDENCY_COMMANDS; do
+ which $DEPENDENCY_COMMAND > /dev/null || ( log_err "Command \"$DEPENDENCY_COMMAND\" can not be found in default path."; exit 1; )
+ done
+}
+
_atexit() {
RETVAL=$?
trap true INT TERM EXIT
diff --git a/tests/test-requirements.txt b/tests/test-requirements.txt
new file mode 100644
index 0000000..bc7dc7f
--- /dev/null
+++ b/tests/test-requirements.txt
@@ -0,0 +1,4 @@
+jsonschema
+reno
+setuptools<45.0.0
+msgpack<1.0.0