From cb795c01df747f872f5985ba318eefdddea57507 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Mon, 24 Oct 2022 14:26:35 +0200 Subject: [OSDF] Enable OSDF in ServiceMesh deployment In case AAF is disabled the secret loading via AAF-SMS should not be called Issue-ID: OPTFRA-1099 Signed-off-by: Andreas Geissler Signed-off-by: Lukasz Rajewski Change-Id: Ifca03215a36705b1c160b2cbf708389bd2162301 --- test/functest/simulators/build_sim_image.sh | 6 +++++- test/functest/simulators/simulated-config/opteng_config.yaml | 2 +- test/functest/simulators/start_sim.sh | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'test/functest') diff --git a/test/functest/simulators/build_sim_image.sh b/test/functest/simulators/build_sim_image.sh index 6a71d3c..561db19 100755 --- a/test/functest/simulators/build_sim_image.sh +++ b/test/functest/simulators/build_sim_image.sh @@ -31,6 +31,10 @@ SIMULATORS_DIR=$FUNC_TEST_DIR/simulators OSDF_DIR=$(dirname $TEST_DIR) DOCKER_DIR=$SIMULATORS_DIR/tmp_docker +echo "Before Docker Build" +cat $OSDF_DIR/requirements-sim.txt +echo $OSDF_DIR + mkdir -p $DOCKER_DIR/sim/osdf/policy/response-payloads/pdp-has-vcpe-good cp $SIMULATORS_DIR/Dockerfile $DOCKER_DIR/. @@ -47,7 +51,7 @@ cp -r $SIMULATORS_DIR/aai $DOCKER_DIR/sim cp $TEST_DIR/policy-local-files/*.json $DOCKER_DIR/sim/policy/response-payloads/pdp-has-vcpe-good cp $TEST_DIR/placement-tests/policy_response.json $DOCKER_DIR/sim/policy/response-payloads/ cp $SIMULATORS_DIR/oof_dependencies_simulators.py $DOCKER_DIR/sim/oof_dependencies_simulators.py -cp $OSDF_DIR/requirements.txt $DOCKER_DIR +cp $OSDF_DIR/requirements-sim.txt $DOCKER_DIR/requirements.txt cp -r $SIMULATORS_DIR/start_sim.sh $DOCKER_DIR/ cd $DOCKER_DIR diff --git a/test/functest/simulators/simulated-config/opteng_config.yaml b/test/functest/simulators/simulated-config/opteng_config.yaml index 4a7e57d..0dfb536 100755 --- a/test/functest/simulators/simulated-config/opteng_config.yaml +++ b/test/functest/simulators/simulated-config/opteng_config.yaml @@ -22,4 +22,4 @@ osdfDatabasePassword: osdf osdfDatabasePort: 3306 #key -appkey: os35@rrtky400fdntc#001t5 \ No newline at end of file +appkey: os35@rrtky400fdntc#001t5 diff --git a/test/functest/simulators/start_sim.sh b/test/functest/simulators/start_sim.sh index 1d17d65..f5935da 100755 --- a/test/functest/simulators/start_sim.sh +++ b/test/functest/simulators/start_sim.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash cd /sim -python oof_dependencies_simulators.py > simulator-logs 2>&1 \ No newline at end of file +python oof_dependencies_simulators.py -- cgit 1.2.3-korg