diff --git a/.gitlab-ci.elife.yml b/.gitlab-ci.elife.yml index adc582e02ac679b1cb35e71d4c349e2d428329f3..2f64279e4d7c5a188bfb9756ac69135eac8e4ed4 100644 --- a/.gitlab-ci.elife.yml +++ b/.gitlab-ci.elife.yml @@ -58,17 +58,46 @@ deploy: sudo docker-compose down && sudo supervisorctl start kotahi" -lint: - allow_failure: true - image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA - stage: test - variables: - GIT_STRATEGY: none - script: - - cd ${HOME} - - npm run lint +# lint: +# allow_failure: true +# image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA +# stage: test +# variables: +# GIT_STRATEGY: none +# script: +# - cd ${HOME} +# - npm run lint + +# .test_template: &run_test_template +# image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA +# stage: test +# variables: +# GIT_STRATEGY: none +# # setup data for postgres image +# POSTGRES_USER: kotahidev +# POSTGRES_PASSWORD: kotahidev +# # used by psql +# PGUSER: kotahidev +# PGPASSWORD: kotahidev +# INSTANCE_NAME: elife +# services: +# - postgres +# script: +# - cd ${HOME} +# - apt-get -y install postgresql-client +# # this is needed for pgboss initial setup +# - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;" +# # use the example env for tests +# - cp .env.example .env +# # specify host here else it confuses the linked postgres image +# - POSTGRES_HOST=postgres yarn test:all:$TEST_ITEM + +# test-chrome: +# <<: *run_test_template +# variables: +# TEST_ITEM: "chrome:elife" -.test_template: &run_test_template +test-chrome: image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA stage: test variables: @@ -79,7 +108,8 @@ lint: # used by psql PGUSER: kotahidev PGPASSWORD: kotahidev - INSTANCE_NAME: elife + # this is used to ignore self signed certs + #START_SERVER_AND_TEST_INSECURE: 1 services: - postgres script: @@ -90,14 +120,7 @@ lint: # use the example env for tests - cp .env.example .env # specify host here else it confuses the linked postgres image - - POSTGRES_HOST=postgres yarn test:all:$TEST_ITEM - -test-chrome: - <<: *run_test_template - variables: - TEST_ITEM: "chrome:elife" - - + - POSTGRES_HOST=postgres yarn test:all:chrome # test-chrome-samsung: # <<: *run_test_template