diff --git a/.gitlab-ci.elife.yml b/.gitlab-ci.elife.yml index 742a59dabaed22f690309e42bfdaa3e735b7d812..1f74ff13fdf9758af0ad8d60eb99b001bf907ebb 100644 --- a/.gitlab-ci.elife.yml +++ b/.gitlab-ci.elife.yml @@ -67,37 +67,7 @@ deploy: # - 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 - services: - - postgres - -.script_templ: &run_script_templ - - cd ${HOME} - - apt-get -y install postgresql-client - # use the example env for tests - - cp .env.example .env - - echo "INSTANCE_NAME=elife" >> .env - -test-chrome: - <<: *run_test_template - script: - - *run_script_templ - # this is needed for pgboss initial setup - - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;" - # specify host here else it confuses the linked postgres image - - POSTGRES_HOST=postgres yarn test:all:chrome:elife - -# test-chrome: +# .test_template: &run_test_template # image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA # stage: test # variables: @@ -108,22 +78,52 @@ test-chrome: # # used by psql # PGUSER: kotahidev # PGPASSWORD: kotahidev -# # this is used to ignore self signed certs -# #START_SERVER_AND_TEST_INSECURE: 1 -# INSTANCE_NAME: elife # services: # - postgres + +# .script_templ: &run_script_templ +# - cd ${HOME} +# - apt-get -y install postgresql-client +# # use the example env for tests +# - cp .env.example .env +# - echo "INSTANCE_NAME=elife" >> .env + +# test-chrome: +# <<: *run_test_template # script: -# - cd ${HOME} -# - apt-get -y install postgresql-client +# - *run_script_templ # # this is needed for pgboss initial setup -# - hostname # - 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:chrome:elife +test-chrome: + 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 + # this is used to ignore self signed certs + #START_SERVER_AND_TEST_INSECURE: 1 + INSTANCE_NAME: elife + services: + - postgres + script: + - cd ${HOME} + - apt-get -y install postgresql-client + # this is needed for pgboss initial setup + - hostname + - 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:chrome:elife + # test-chrome-samsung: # <<: *run_test_template # variables: