From 34154c4cf0b518adf99b213b2fb96650ebaff62a Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 00:09:47 +0200 Subject: [PATCH 01/15] perform only when package-lock.json changes --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f4ccfe..af4c21d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,9 +29,9 @@ build_fe: key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR paths: - frontend/node_modules/ -# only: -# changes: -# - frontend/package-lock.json + only: + changes: + - frontend/package-lock.json extends: - .build From 48b67ad37406f3b460ad791be44d18d33f039346 Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 00:37:15 +0200 Subject: [PATCH 02/15] allow_failure: true --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af4c21d..8bf068e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,6 +100,7 @@ test_fe: - .angular-image needs: - lint_fe + allow_failure: true #test_be: # script: From d650a2403c2dc01c9171c0a5d0b163d0ca3872af Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 01:06:09 +0200 Subject: [PATCH 03/15] 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 04/15] 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 05/15] 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', From 1a6c289b9aed2500fc68df68f149de5a1d594f86 Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 12:13:47 +0200 Subject: [PATCH 06/15] install chromium to fix chrome not starting issue; --- .gitlab-ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61b28c9..246c6cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,9 +86,19 @@ lint_fe: stage: test test_fe: - script: + before_script: - cd ./frontend - npm install + - apk add --no-cache \ + chromium \ + nss \ + freetype \ + freetype-dev \ + harfbuzz \ + ca-certificates \ + ttf-freefont + - export CHROME_BIN=/usr/bin/chromium-browser + script: - npm run -- ng test cache: key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR From 5e761f6559cd4485dc41574a6cee77c324348a3d Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 12:19:03 +0200 Subject: [PATCH 07/15] fix installation issue --- .gitlab-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1678e9f..25ff58d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,14 +89,7 @@ test_fe: before_script: - cd ./frontend - npm install - - apk add --no-cache \ - chromium \ - nss \ - freetype \ - freetype-dev \ - harfbuzz \ - ca-certificates \ - ttf-freefont + - apk add --no-cache chromium - export CHROME_BIN=/usr/bin/chromium-browser script: - npm run -- ng test From d1f0c6ee8d528fa7c880f960599a53de3b3ae316 Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Tue, 11 May 2021 20:18:31 +0200 Subject: [PATCH 08/15] added one smoke test which always succeeds (for ci config). (cherry picked from commit e80f2a9182fc9977fb8112b914a221e0ffbb97bb) (cherry picked from commit 3fa0a9b51b2d23cff0d4fa95047a61a849799cb2) --- frontend/src/app/component/smoke.spec.ts | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 frontend/src/app/component/smoke.spec.ts 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(); + }); +}); From 3bc93019d6fbd6685906482aa76cebb13cff8236 Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 12:41:48 +0200 Subject: [PATCH 09/15] dbg artifacts; --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25ff58d..acef151 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,6 +152,7 @@ docker-build-be: script: - docker-compose build waecm_g4_be - docker save -o img/waecm_g4_be ${DOCKER_USER}/${ASSIGNMENT}-be + - ls -l ./img extends: - .docker-build - .docker-setup @@ -169,6 +170,7 @@ docker-push-fe: script: - docker image load --input img/waecm_g4_fe - docker image push ${DOCKER_USER}/${ASSIGNMENT}-fe + - ls -l ./img extends: - .docker-push - .docker-setup From b90bef78530a4e3a402938731e7856ef2cd599b1 Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 12:46:57 +0200 Subject: [PATCH 10/15] added when and expire --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acef151..c41de0e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -128,6 +128,8 @@ test_fe: - docker login -u $DOCKER_USER -p $DOCKER_PW - mkdir ./img artifacts: + when: always + expire_in: 1 week paths: - /img tags: From c8d8d08a35fd451d4f8f801eb031471d1c28e426 Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 12:57:00 +0200 Subject: [PATCH 11/15] try to fix artifacts --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c41de0e..dad6b7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,11 +127,6 @@ test_fe: before_script: - docker login -u $DOCKER_USER -p $DOCKER_PW - mkdir ./img - artifacts: - when: always - expire_in: 1 week - paths: - - /img tags: - docker @@ -149,6 +144,9 @@ docker-build-fe: - .docker-setup needs: - test_fe + artifacts: + paths: + - img/waecm_g4_fe docker-build-be: script: @@ -160,6 +158,9 @@ docker-build-be: - .docker-setup needs: - build_be + artifacts: + paths: + - img/waecm_g4_be ######## # DOCKER-PUSH From 433a6d519bae86085d9994966fc2278804bf1795 Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 13:01:16 +0200 Subject: [PATCH 12/15] fix artifact path; --- .gitlab-ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dad6b7b..2b3ee59 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,6 +127,9 @@ test_fe: before_script: - docker login -u $DOCKER_USER -p $DOCKER_PW - mkdir ./img + artifacts: + paths: + - /img/* tags: - docker @@ -144,23 +147,16 @@ 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 img/waecm_g4_be ${DOCKER_USER}/${ASSIGNMENT}-be - - ls -l ./img extends: - .docker-build - .docker-setup needs: - build_be - artifacts: - paths: - - img/waecm_g4_be ######## # DOCKER-PUSH @@ -173,7 +169,6 @@ docker-push-fe: script: - docker image load --input img/waecm_g4_fe - docker image push ${DOCKER_USER}/${ASSIGNMENT}-fe - - ls -l ./img extends: - .docker-push - .docker-setup From 9e88b489c8bcc91c009272596230e53ae2480daa Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 13:03:16 +0200 Subject: [PATCH 13/15] mkdir if not exists --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b3ee59..148cb48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,7 +126,7 @@ test_fe: - docker:dind before_script: - docker login -u $DOCKER_USER -p $DOCKER_PW - - mkdir ./img + - mkdir -p ./img # mkdir if not exists artifacts: paths: - /img/* From e1661dcd22e7e5ba237472ba60470fb5ff9191d8 Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 12:57:00 +0200 Subject: [PATCH 14/15] try to fix artifacts (cherry picked from commit c8d8d08a35fd451d4f8f801eb031471d1c28e426) --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 148cb48..638846e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,9 +127,6 @@ test_fe: before_script: - docker login -u $DOCKER_USER -p $DOCKER_PW - mkdir -p ./img # mkdir if not exists - artifacts: - paths: - - /img/* tags: - docker @@ -147,6 +144,9 @@ docker-build-fe: - .docker-setup needs: - test_fe + artifacts: + paths: + - img/waecm_g4_fe docker-build-be: script: @@ -157,6 +157,9 @@ docker-build-be: - .docker-setup needs: - build_be + artifacts: + paths: + - img/waecm_g4_be ######## # DOCKER-PUSH From 52ae9e8faa056e8e850648f9e04dbe50bb184cd6 Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Wed, 12 May 2021 13:28:44 +0200 Subject: [PATCH 15/15] deactivate CI for now to safe free minutes. --- .gitlab-ci.yml => .gitlab-ci.yml.inactive | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitlab-ci.yml => .gitlab-ci.yml.inactive (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml.inactive similarity index 100% rename from .gitlab-ci.yml rename to .gitlab-ci.yml.inactive