From d650a2403c2dc01c9171c0a5d0b163d0ca3872af Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 01:06:09 +0200 Subject: [PATCH 1/3] improve artifacts not to push node_modules --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61b28c9..59346b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,14 +124,15 @@ test_fe: before_script: - docker login -u $DOCKER_USER -p $DOCKER_PW artifacts: - untracked: true + paths: + - /img tags: - docker docker-build-fe: script: - docker-compose build waecm_g4_fe - - docker save -o waecm_g4_fe ${DOCKER_USER}/${ASSIGNMENT}-fe + - docker save -o img/waecm_g4_fe ${DOCKER_USER}/${ASSIGNMENT}-fe cache: key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR paths: @@ -146,7 +147,7 @@ docker-build-fe: docker-build-be: script: - docker-compose build waecm_g4_be - - docker save -o waecm_g4_be ${DOCKER_USER}/${ASSIGNMENT}-be + - docker save -o img/waecm_g4_be ${DOCKER_USER}/${ASSIGNMENT}-be extends: - .docker-build - .docker-setup @@ -162,7 +163,7 @@ docker-build-be: docker-push-fe: script: - - docker image load --input waecm_g4_fe + - docker image load --input img/waecm_g4_fe - docker image push ${DOCKER_USER}/${ASSIGNMENT}-fe extends: - .docker-push @@ -172,7 +173,7 @@ docker-push-fe: docker-push-be: script: - - docker image load --input waecm_g4_be + - docker image load --input img/waecm_g4_be - docker image push ${DOCKER_USER}/${ASSIGNMENT}-be extends: - .docker-push From 1a6194762e86973cc4b49545205c9c7cf8e3eeb1 Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 01:08:04 +0200 Subject: [PATCH 2/3] mkdir ./img --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59346b1..e2ecb4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,6 +123,7 @@ test_fe: - docker:dind before_script: - docker login -u $DOCKER_USER -p $DOCKER_PW + - mkdir ./img artifacts: paths: - /img From f7b807c6a860679fe5c9f25c1dda478cd9942efa Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 12:08:47 +0200 Subject: [PATCH 3/3] fix config --- frontend/karma.conf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/karma.conf.js b/frontend/karma.conf.js index f3ef27f..8f5c38f 100644 --- a/frontend/karma.conf.js +++ b/frontend/karma.conf.js @@ -40,9 +40,9 @@ module.exports = function(config) { logLevel: config.LOG_INFO, autoWatch: true, // browsers: ['Chrome', 'ChromeHeadless'], - browsers: ['ChromeHeadless'], + browsers: ['MyChromeHeadless'], customLaunchers: { - ChromeHeadless: { + MyChromeHeadless: { base: 'Chrome', flags: [ '--headless',