@@ -48,7 +48,7 @@ variables:
4848 CF_ENV_NETWORK_TOPOLOGY : ' same_network'
4949 CF_ENV_NIC_COUNT : 3
5050 CF_ENV_USE_FORWARDING_RULE : ' true'
51-
51+ GIT_SUBMODULE_STRATEGY : recursive
5252
5353# check for disallowed content within any file in source control, this
5454# supplements the native pre-receive push rules built into GitLab for secrets
@@ -133,7 +133,7 @@ test_audit:
133133 - $CI_COMMIT_REF_NAME == "docs_staging"
134134 script :
135135 # npm audit - uses custom audit processor wrapper
136- - npm install
136+ - npm install --unsafe-perm
137137 - npm run audit
138138 tags :
139139 - cm-official-docker-executor
@@ -167,12 +167,21 @@ coverage:
167167# Functional Tests - Initialization phase (with 1 retries in a case of any failures)
168168.test_functional_init_generic : &test_functional_init_generic
169169 stage : test_functional_init
170- image : ${ARTIFACTORY_SERVER}/ecosystems-cloudsolutions-docker-dev/deployment-tool:latest
170+ image : ${ARTIFACTORY_SERVER}/dockerhub-remote/hashicorp/terraform:0.12.31
171171 retry :
172172 max : 1
173173 script :
174174 # deploy environment - required artifacts will be place in output folder
175- - /deployment-tool/deploy.sh --deployment-plan ${CF_ENV_CLOUD} --action create --output-folder env_metadata/${CF_ENV_CLOUD}_${CF_ENV_NETWORK_TOPOLOGY}_${CF_ENV_NIC_COUNT}_${CF_ENV_REGION} --deployment-vars region:\"${CF_ENV_REGION}\" --skip-requirements "true"
175+ - apk add --update
176+ - apk add bash curl jq build-base openssl-dev libffi-dev git
177+ - apk add jq openssh-client sshpass python3 python3-dev
178+ - ln -sf python3 /usr/bin/python
179+ - python -m ensurepip
180+ - ln -s pip3 /usr/bin/pip
181+ - pip install --upgrade pip
182+ - apk add npm
183+ - pip install -r deployment-tool/dependencies/requirements.txt
184+ - deployment-tool/deploy.sh --deployment-plan ${CF_ENV_CLOUD} --action create --output-folder env_metadata/${CF_ENV_CLOUD}_${CF_ENV_NETWORK_TOPOLOGY}_${CF_ENV_NIC_COUNT}_${CF_ENV_REGION} --deployment-vars region:\"${CF_ENV_REGION}\" --skip-requirements "true"
176185 tags :
177186 - cm-official-docker-executor
178187 only :
@@ -437,7 +446,6 @@ test_functional_execute_aws_ca_central:
437446 when :
438447 manual
439448
440-
441449# run functional tests: aws - same network topology for 1nic
442450test_functional_execute_aws_1nic :
443451 << : *test_functional_execute_generic
@@ -483,15 +491,24 @@ test_functional_execute_gcp_no_forwarding_rule:
483491# Functional Tests - Cleanup phase (executes always with 1 retry in a case of any failures)
484492.test_functional_cleanup_generic : &test_functional_cleanup_generic
485493 stage : test_functional_cleanup
486- image : ${ARTIFACTORY_SERVER}/ecosystems-cloudsolutions-docker-dev/deployment-tool:latest
494+ image : ${ARTIFACTORY_SERVER}/dockerhub-remote/hashicorp/terraform:0.12.31
487495 retry :
488496 max : 1
489497 when : always
490498 script :
499+ - apk add --update
500+ - apk add bash curl jq build-base openssl-dev libffi-dev git
501+ - apk add jq openssh-client sshpass python3 python3-dev
502+ - ln -sf python3 /usr/bin/python
503+ - python -m ensurepip
504+ - ln -s pip3 /usr/bin/pip
505+ - pip install --upgrade pip
506+ - apk add npm
507+ - pip install -r deployment-tool/dependencies/requirements.txt
491508 # copying artifacts inherited from functional_test_init target to root directory
492509 - cp -a env_metadata/${CF_ENV_CLOUD}_${CF_ENV_NETWORK_TOPOLOGY}_${CF_ENV_NIC_COUNT}_${CF_ENV_REGION}/. .
493510 # teardown environment
494- - / deployment-tool/deploy.sh --deployment-plan ${CF_ENV_CLOUD} --action delete --deployment-vars region:\"${CF_ENV_REGION}\" --skip-requirements "true"
511+ - deployment-tool/deploy.sh --deployment-plan ${CF_ENV_CLOUD} --action delete --deployment-vars region:\"${CF_ENV_REGION}\" --skip-requirements "true"
495512 tags :
496513 - cm-official-docker-executor
497514 only :
0 commit comments