Skip to content

Commit

Permalink
add internal-services-test to helpers tests (#626)
Browse files Browse the repository at this point in the history
  • Loading branch information
tobybellwood committed Dec 14, 2022
1 parent 0adbd1f commit 0e58098
Show file tree
Hide file tree
Showing 5 changed files with 182 additions and 104 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ openshift
!services/api/src/resources/openshift
.loopback
*~
/helpers/test
/helpers/node_modules
/helpers/yarn.lock
/helpers/package.json
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ node ('lagoon-images') {
// sh script: "git submodule add -b php81 https://github.com/lagoon-examples/drupal9-base drupal9-base-php81"
sh script: "git submodule sync && git submodule update --init"
sh script: "mkdir -p ./all-images && cp ../helpers/docker-compose.yml ./all-images/ && cp ../helpers/TESTING_dockercompose.md ./all-images/"
sh script: "sed -i '/image:/ s/uselagoon/${CI_BUILD_TAG}/' ./all-images/docker-compose.yml"
sh script: "sed -i '/image: uselagoon/ s/uselagoon/${CI_BUILD_TAG}/' ./all-images/docker-compose.yml"
sh script: "yarn install"
sh script: "yarn generate-tests"
sh script: "docker network inspect amazeeio-network >/dev/null || docker network create amazeeio-network"
Expand Down Expand Up @@ -94,7 +94,7 @@ node ('lagoon-images') {
stage ('running test suite') {
dir ('tests') {
sh script: "grep -rl uselagoon . | xargs sed -i '/^FROM/ s/uselagoon/${CI_BUILD_TAG}/'"
sh script: "grep -rl uselagoon . | xargs sed -i '/image:/ s/uselagoon/${CI_BUILD_TAG}/'"
sh script: "grep -rl uselagoon . | xargs sed -i '/image: uselagoon/ s/uselagoon/${CI_BUILD_TAG}/'"
sh script: "find . -maxdepth 2 -name docker-compose.yml | xargs sed -i -e '/###/d'"
sh script: "yarn test:simple", label: "Run simple Drupal tests"
sh script: "yarn test:advanced", label: "Run advanced Drupal tests"
Expand Down
1 change: 1 addition & 0 deletions helpers/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
COMPOSE_PROJECT_NAME=all-images
Loading

0 comments on commit 0e58098

Please sign in to comment.