diff --git a/Jenkinsfile b/Jenkinsfile index 2ea09b2..c0119f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,5 @@ node { checkout scm - /* .. snip .. */ } pipeline { @@ -9,8 +8,12 @@ pipeline { stages { stage('Build') { steps { - sh "cd docker/development; docker compose build" - + sh "make build-test" + } + } + stage('Test') { + steps { + sh "make test" } } } diff --git a/Makefile b/Makefile index cebce5d..b0e4f34 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ build-test: - cd docker/test; docker-compose build + cd docker/test; docker compose build test: build-test - cd docker/test; docker-compose up --abort-on-container-exit + cd docker/test; docker compose up --abort-on-container-exit