diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml.inactive similarity index 86% rename from .gitlab-ci.yml rename to .gitlab-ci.yml.inactive index 61b28c9..638846e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml.inactive @@ -86,9 +86,12 @@ lint_fe: stage: test test_fe: - script: + before_script: - cd ./frontend - npm install + - apk add --no-cache chromium + - export CHROME_BIN=/usr/bin/chromium-browser + script: - npm run -- ng test cache: key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR @@ -123,15 +126,14 @@ test_fe: - docker:dind before_script: - docker login -u $DOCKER_USER -p $DOCKER_PW - artifacts: - untracked: true + - mkdir -p ./img # mkdir if not exists 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: @@ -142,16 +144,22 @@ docker-build-fe: - .docker-setup needs: - test_fe + artifacts: + paths: + - img/waecm_g4_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 needs: - build_be + artifacts: + paths: + - img/waecm_g4_be ######## # DOCKER-PUSH @@ -162,7 +170,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 +180,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 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', diff --git a/frontend/src/app/component/smoke.spec.ts b/frontend/src/app/component/smoke.spec.ts new file mode 100644 index 0000000..dae70f9 --- /dev/null +++ b/frontend/src/app/component/smoke.spec.ts @@ -0,0 +1,5 @@ +describe('smoke', () => { + it('should succeed', () => { + expect(true).toBeTruthy(); + }); +});