From 304550c2ae577446079ba2d64675f48fe0398ed4 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 18:53:04 +0000 Subject: [PATCH 01/19] Update apps/cic-eth/.gitlab-ci.yml --- apps/cic-eth/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml index 588a0788..bc807831 100644 --- a/apps/cic-eth/.gitlab-ci.yml +++ b/apps/cic-eth/.gitlab-ci.yml @@ -26,7 +26,7 @@ test-mr-cic-eth: script: - cd apps/$APP_NAME/ - pip install -r test_requirements.txt - - pytest -x --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests + - export PYTHONPATH . && pytest -x --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests needs: ["build-mr-cic-eth"] build-push-cic-eth: From ecc5d266661326dfda737ee1ea71a1f69c6941bc Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 19:00:09 +0000 Subject: [PATCH 02/19] Update apps/cic-eth/.gitlab-ci.yml --- apps/cic-eth/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml index bc807831..beb943b8 100644 --- a/apps/cic-eth/.gitlab-ci.yml +++ b/apps/cic-eth/.gitlab-ci.yml @@ -26,7 +26,7 @@ test-mr-cic-eth: script: - cd apps/$APP_NAME/ - pip install -r test_requirements.txt - - export PYTHONPATH . && pytest -x --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests + - export PYTHONPATH=. && pytest -x --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests needs: ["build-mr-cic-eth"] build-push-cic-eth: From c8e24c96c5ed0d6c29298cc846b20ea27604050c Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 19:10:49 +0000 Subject: [PATCH 03/19] Update apps/cic-eth/.gitlab-ci.yml --- apps/cic-eth/.gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml index beb943b8..588c11e6 100644 --- a/apps/cic-eth/.gitlab-ci.yml +++ b/apps/cic-eth/.gitlab-ci.yml @@ -22,6 +22,12 @@ test-mr-cic-eth: extends: - .cic_eth_variables - .cic_eth_changes_target + cache: + key: + files: + - test_requirements.txt + paths: + - /root/.cache/pip image: $MR_IMAGE_TAG script: - cd apps/$APP_NAME/ From e3da256e663a8498ff77ad3efe1f477f960de345 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 19:11:51 +0000 Subject: [PATCH 04/19] Update apps/cic-eth/.gitlab-ci.yml --- apps/cic-eth/.gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml index 588c11e6..4c8f5b16 100644 --- a/apps/cic-eth/.gitlab-ci.yml +++ b/apps/cic-eth/.gitlab-ci.yml @@ -24,8 +24,8 @@ test-mr-cic-eth: - .cic_eth_changes_target cache: key: - files: - - test_requirements.txt + files: + - test_requirements.txt paths: - /root/.cache/pip image: $MR_IMAGE_TAG From 4ecf4f12147424839b0a5bbfdbe509e5a04d2818 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 19:36:17 +0000 Subject: [PATCH 05/19] Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml, .gitlab-ci.yml, apps/contract-migration/.gitlab-ci.yml files --- .gitlab-ci.yml | 2 +- apps/cic-eth/.gitlab-ci.yml | 5 +++-- apps/contract-migration/.gitlab-ci.yml | 12 ++++++++++-- ci_templates/.cic-template.yml | 6 ------ 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d948128f..44271fdb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ include: - local: 'ci_templates/.cic-template.yml' - # - local: 'apps/contract-migration/.gitlab-ci.yml' + - local: 'apps/contract-migration/.gitlab-ci.yml' - local: 'apps/cic-eth/.gitlab-ci.yml' # - local: 'apps/cic-ussd/.gitlab-ci.yml' # - local: 'apps/cic-notify/.gitlab-ci.yml' diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml index 4c8f5b16..7600d75b 100644 --- a/apps/cic-eth/.gitlab-ci.yml +++ b/apps/cic-eth/.gitlab-ci.yml @@ -7,9 +7,10 @@ .cic_eth_changes_target: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - #changes: - #- $CONTEXT/$APP_NAME/**/* + changes: + - $CONTEXT/**/* when: always + - when: never build-mr-cic-eth: extends: diff --git a/apps/contract-migration/.gitlab-ci.yml b/apps/contract-migration/.gitlab-ci.yml index 39efdbfb..bbd399f1 100644 --- a/apps/contract-migration/.gitlab-ci.yml +++ b/apps/contract-migration/.gitlab-ci.yml @@ -3,10 +3,18 @@ APP_NAME: contract-migration DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci +# .contract_migration_changes_target: +# rules: +# - changes: +# - $CONTEXT/$APP_NAME/* + .contract_migration_changes_target: rules: - - changes: - - $CONTEXT/$APP_NAME/* + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - $CONTEXT/**/* + when: always + - when: never build-mr-contract-migration: extends: diff --git a/ci_templates/.cic-template.yml b/ci_templates/.cic-template.yml index 9ee581d5..81799d34 100644 --- a/ci_templates/.cic-template.yml +++ b/ci_templates/.cic-template.yml @@ -16,9 +16,6 @@ variables: - mkdir -p /kaniko/.docker - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json" - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --cache-repo $CI_REGISTRY_IMAGE --destination $IMAGE_TAG - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - when: always .py_build_target_dev: stage: build @@ -28,9 +25,6 @@ variables: - mkdir -p /kaniko/.docker - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json" - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --cache-repo $CI_REGISTRY_IMAGE --target dev --tarPath $APP_NAME-test-image.tar --destination $MR_IMAGE_TAG - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - when: always .py_build_push: stage: build From b86b57bcb7d7f5daa8d0d0433ab4e977386b8ec1 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 19:40:36 +0000 Subject: [PATCH 06/19] Update apps/contract-migration/docker/Dockerfile --- apps/contract-migration/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index ffeb8dc5..1a46a103 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -40,3 +40,4 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ COPY contract-migration/ . RUN chmod +x *.sh +RUN echo "i am testing the rules engine" From b3b051d3d5e3c2f8f23a2cf77f4c821a1206ce88 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 19:41:24 +0000 Subject: [PATCH 07/19] Update apps/contract-migration/.gitlab-ci.yml, apps/contract-migration/docker/Dockerfile files --- apps/contract-migration/.gitlab-ci.yml | 1 - apps/contract-migration/docker/Dockerfile | 1 - 2 files changed, 2 deletions(-) diff --git a/apps/contract-migration/.gitlab-ci.yml b/apps/contract-migration/.gitlab-ci.yml index bbd399f1..9903c0f9 100644 --- a/apps/contract-migration/.gitlab-ci.yml +++ b/apps/contract-migration/.gitlab-ci.yml @@ -14,7 +14,6 @@ changes: - $CONTEXT/**/* when: always - - when: never build-mr-contract-migration: extends: diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 1a46a103..ffeb8dc5 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -40,4 +40,3 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ COPY contract-migration/ . RUN chmod +x *.sh -RUN echo "i am testing the rules engine" From 0fa7b99a1514357483acd821c841701bd96683f3 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 19:42:42 +0000 Subject: [PATCH 08/19] Update apps/contract-migration/.gitlab-ci.yml --- apps/contract-migration/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/contract-migration/.gitlab-ci.yml b/apps/contract-migration/.gitlab-ci.yml index 9903c0f9..3f0003bd 100644 --- a/apps/contract-migration/.gitlab-ci.yml +++ b/apps/contract-migration/.gitlab-ci.yml @@ -12,7 +12,7 @@ rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: - - $CONTEXT/**/* + - apps/contract-migration/**/* when: always build-mr-contract-migration: From db4eb31de084719b02e519082fe0597fd764946e Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 19:43:44 +0000 Subject: [PATCH 09/19] Update apps/contract-migration/docker/Dockerfile --- apps/contract-migration/docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index ffeb8dc5..b586a0f8 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -40,3 +40,5 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ COPY contract-migration/ . RUN chmod +x *.sh + +RUN echo "TEST THE RULESSSS" From 8cdd40512259eeeecd6725f8a3cebc3b33552b54 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 19:51:53 +0000 Subject: [PATCH 10/19] Update apps/contract-migration/docker/Dockerfile, apps/cic-eth/.gitlab-ci.yml, ci_templates/.cic-template.yml, apps/contract-migration/.gitlab-ci.yml files --- apps/cic-eth/.gitlab-ci.yml | 23 +++++++++++++--------- apps/contract-migration/.gitlab-ci.yml | 24 +++++++++++------------ apps/contract-migration/docker/Dockerfile | 4 +--- ci_templates/.cic-template.yml | 3 --- 4 files changed, 26 insertions(+), 28 deletions(-) diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml index 7600d75b..58c0d13b 100644 --- a/apps/cic-eth/.gitlab-ci.yml +++ b/apps/cic-eth/.gitlab-ci.yml @@ -4,25 +4,20 @@ DOCKERFILE_PATH: docker/Dockerfile_ci CONTEXT: $CI_PROJECT_DIR/apps/$APP_NAME -.cic_eth_changes_target: +build-mr-cic-eth: + extends: + - .cic_eth_variables + - .py_build_target_dev rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: - $CONTEXT/**/* when: always - - when: never - -build-mr-cic-eth: - extends: - - .cic_eth_variables - - .cic_eth_changes_target - - .py_build_target_dev test-mr-cic-eth: stage: test extends: - .cic_eth_variables - - .cic_eth_changes_target cache: key: files: @@ -35,8 +30,18 @@ test-mr-cic-eth: - pip install -r test_requirements.txt - export PYTHONPATH=. && pytest -x --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests needs: ["build-mr-cic-eth"] + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - $CONTEXT/**/* + when: always build-push-cic-eth: extends: - .py_build_push - .cic_eth_variables + rules: + - if: $CI_COMMIT_BRANCH == "master" + changes: + - $CONTEXT/**/* + when: always diff --git a/apps/contract-migration/.gitlab-ci.yml b/apps/contract-migration/.gitlab-ci.yml index 3f0003bd..035e2746 100644 --- a/apps/contract-migration/.gitlab-ci.yml +++ b/apps/contract-migration/.gitlab-ci.yml @@ -2,26 +2,24 @@ variables: APP_NAME: contract-migration DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci - -# .contract_migration_changes_target: -# rules: -# - changes: -# - $CONTEXT/$APP_NAME/* - -.contract_migration_changes_target: - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - changes: - - apps/contract-migration/**/* - when: always + CONTEXT: $CI_PROJECT_DIR/apps/$APP_NAME build-mr-contract-migration: extends: - - .contract_migration_changes_target - .py_build_merge_request - .contract_migration_variables + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - $CONTEXT/**/* + when: always build-push-contract-migration: extends: - .py_build_push - .contract_migration_variables + rules: + - if: $CI_COMMIT_BRANCH == "master" + changes: + - $CONTEXT/**/* + when: always diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index b586a0f8..163e6545 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -39,6 +39,4 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ -r requirements.txt COPY contract-migration/ . -RUN chmod +x *.sh - -RUN echo "TEST THE RULESSSS" +RUN chmod +x *.sh \ No newline at end of file diff --git a/ci_templates/.cic-template.yml b/ci_templates/.cic-template.yml index 81799d34..6125c0ed 100644 --- a/ci_templates/.cic-template.yml +++ b/ci_templates/.cic-template.yml @@ -37,9 +37,6 @@ variables: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json" # - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --destination $IMAGE_TAG - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --destination $IMAGE_TAG --destination $CI_REGISTRY_IMAGE/$APP_NAME:latest - rules: - - if: $CI_COMMIT_BRANCH == "master" - when: always From 3256f23121f815b902a6425cd6e8f384ce16eeb8 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 19:52:55 +0000 Subject: [PATCH 11/19] Update apps/cic-eth/docker/Dockerfile --- apps/cic-eth/docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile index be14f816..539726c2 100644 --- a/apps/cic-eth/docker/Dockerfile +++ b/apps/cic-eth/docker/Dockerfile @@ -62,5 +62,7 @@ COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ # TODO this kind of code sharing across projects should be discouraged...can we make util a library? #COPY util/liveness/health.sh /usr/local/bin/health.sh +RUN echo "TEST RULE CHANGE" + ENTRYPOINT [] From 58f3a90206fdc11c51cd31db2b9c4ca9778d26f6 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 19:54:36 +0000 Subject: [PATCH 12/19] Update apps/contract-migration/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml files --- apps/cic-eth/.gitlab-ci.yml | 6 +++--- apps/contract-migration/.gitlab-ci.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml index 58c0d13b..ef2b02ce 100644 --- a/apps/cic-eth/.gitlab-ci.yml +++ b/apps/cic-eth/.gitlab-ci.yml @@ -11,7 +11,7 @@ build-mr-cic-eth: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: - - $CONTEXT/**/* + - apps/cic-eth/**/* when: always test-mr-cic-eth: @@ -33,7 +33,7 @@ test-mr-cic-eth: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: - - $CONTEXT/**/* + - apps/cic-eth/**/* when: always build-push-cic-eth: @@ -43,5 +43,5 @@ build-push-cic-eth: rules: - if: $CI_COMMIT_BRANCH == "master" changes: - - $CONTEXT/**/* + - apps/cic-eth/**/* when: always diff --git a/apps/contract-migration/.gitlab-ci.yml b/apps/contract-migration/.gitlab-ci.yml index 035e2746..14f12262 100644 --- a/apps/contract-migration/.gitlab-ci.yml +++ b/apps/contract-migration/.gitlab-ci.yml @@ -11,7 +11,7 @@ build-mr-contract-migration: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: - - $CONTEXT/**/* + - apps/contract-migration/**/* when: always build-push-contract-migration: @@ -21,5 +21,5 @@ build-push-contract-migration: rules: - if: $CI_COMMIT_BRANCH == "master" changes: - - $CONTEXT/**/* + - apps/contract-migration/**/* when: always From d679a8441e7d99aceb8813d53c3bf47447c00282 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 20:05:18 +0000 Subject: [PATCH 13/19] Update .gitlab-ci.yml, apps/data-seeding/.gitlab-ci.yml, apps/cic-ussd/.gitlab-ci.yml, apps/cic-notify/.gitlab-ci.yml, apps/cic-meta/.gitlab-ci.yml, apps/cic-cache/.gitlab-ci.yml files --- .gitlab-ci.yml | 2 +- apps/cic-cache/.gitlab-ci.yml | 16 +++++++++----- apps/cic-meta/.gitlab-ci.yml | 38 ++++++++++++++++---------------- apps/cic-notify/.gitlab-ci.yml | 15 ++++++++----- apps/cic-ussd/.gitlab-ci.yml | 15 ++++++++----- apps/data-seeding/.gitlab-ci.yml | 16 +++++++++----- 6 files changed, 60 insertions(+), 42 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44271fdb..321d5559 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ include: # - local: 'apps/cic-notify/.gitlab-ci.yml' # - local: 'apps/cic-meta/.gitlab-ci.yml' # - local: 'apps/cic-cache/.gitlab-ci.yml' - # - local: 'apps/data-seeding/.gitlab-ci.yml' + - local: 'apps/data-seeding/.gitlab-ci.yml' stages: - build diff --git a/apps/cic-cache/.gitlab-ci.yml b/apps/cic-cache/.gitlab-ci.yml index e39cb189..7329ec13 100644 --- a/apps/cic-cache/.gitlab-ci.yml +++ b/apps/cic-cache/.gitlab-ci.yml @@ -3,20 +3,24 @@ APP_NAME: cic-cache DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile -.cic_cache_changes_target: - rules: - - changes: - - $CONTEXT/$APP_NAME/* - build-mr-cic-cache: extends: - - .cic_cache_changes_target - .py_build_merge_request - .cic_cache_variables + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - apps/cic-cache/**/* + when: always build-push-cic-cache: extends: - .py_build_push - .cic_cache_variables + rules: + - if: $CI_COMMIT_BRANCH == "master" + changes: + - apps/cic-cache/**/* + when: always diff --git a/apps/cic-meta/.gitlab-ci.yml b/apps/cic-meta/.gitlab-ci.yml index d1ed979c..7aac4f90 100644 --- a/apps/cic-meta/.gitlab-ci.yml +++ b/apps/cic-meta/.gitlab-ci.yml @@ -5,40 +5,40 @@ DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile IMAGE_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:unittest-$CI_COMMIT_SHORT_SHA -.cic_meta_changes_target: +build-mr-cic-meta: + extends: + - .py_build_merge_request + - .cic_notify_variables rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" -# - changes: -# - $CONTEXT/$APP_NAME/* - - when: always - -cic-meta-build-mr: - stage: build - extends: - - .cic_meta_variables - - .cic_meta_changes_target - script: - - mkdir -p /kaniko/.docker - - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json" - # - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --destination $IMAGE_TAG - - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --destination $IMAGE_TAG + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - apps/cic-meta/**/* + when: always test-mr-cic-meta: extends: - .cic_meta_variables - .cic_meta_changes_target stage: test - image: $IMAGE_TAG + image: $MR_IMAGE_TAG script: - cd /tmp/src/cic-meta - npm install --dev - npm run test - npm run test:coverage needs: ["cic-meta-build-mr"] + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - apps/cic-meta/**/* + when: always build-push-cic-meta: extends: - .py_build_push - .cic_meta_variables - - + rules: + - if: $CI_COMMIT_BRANCH == "master" + changes: + - apps/cic-meta/**/* + when: always diff --git a/apps/cic-notify/.gitlab-ci.yml b/apps/cic-notify/.gitlab-ci.yml index 34695d7f..153f0d47 100644 --- a/apps/cic-notify/.gitlab-ci.yml +++ b/apps/cic-notify/.gitlab-ci.yml @@ -3,20 +3,25 @@ APP_NAME: cic-notify DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile -.cic_notify_changes_target: - rules: - - changes: - - $CONTEXT/$APP_NAME/* - build-mr-cic-notify: extends: - .cic_notify_changes_target - .py_build_merge_request - .cic_notify_variables + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - apps/cic-notify/**/* + when: always build-push-cic-notify: extends: - .py_build_push - .cic_notify_variables + rules: + - if: $CI_COMMIT_BRANCH == "master" + changes: + - apps/cic-notify/**/* + when: always diff --git a/apps/cic-ussd/.gitlab-ci.yml b/apps/cic-ussd/.gitlab-ci.yml index 983fa19b..99ad5e29 100644 --- a/apps/cic-ussd/.gitlab-ci.yml +++ b/apps/cic-ussd/.gitlab-ci.yml @@ -3,20 +3,25 @@ APP_NAME: cic-ussd DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile -.cic_ussd_changes_target: - rules: - - changes: - - $CONTEXT/$APP_NAME/* - build-mr-cic-ussd: extends: - .cic_ussd_changes_target - .py_build_merge_request - .cic_ussd_variables + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - apps/cic-ussd/**/* + when: always build-push-cic-ussd: extends: - .py_build_push - .cic_ussd_variables + rules: + - if: $CI_COMMIT_BRANCH == "master" + changes: + - apps/cic-ussd/**/* + when: always diff --git a/apps/data-seeding/.gitlab-ci.yml b/apps/data-seeding/.gitlab-ci.yml index b0073e9e..eebf7a47 100644 --- a/apps/data-seeding/.gitlab-ci.yml +++ b/apps/data-seeding/.gitlab-ci.yml @@ -3,19 +3,23 @@ APP_NAME: data-seeding DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci -.data_seeding_changes_target: - rules: - - changes: - - $CONTEXT/$APP_NAME/* - build-mr-data-seeding: extends: - - .data_seeding_changes_target - .py_build_merge_request - .data_seeding_variables + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - apps/data-seeding/**/* + when: always build-push-data-seeding: extends: - .py_build_push - .data_seeding_variables + rules: + - if: $CI_COMMIT_BRANCH == "master" + changes: + - apps/data-seeding/**/* + when: always From e8f65dcd295d9dc53de06e4f6ebbe1d16fc17d09 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 20:27:32 +0000 Subject: [PATCH 14/19] Update apps/contract-migration/.gitlab-ci.yml, apps/data-seeding/.gitlab-ci.yml, .gitlab-ci.yml, apps/cic-cache/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml, apps/cic-meta/.gitlab-ci.yml, apps/cic-notify/.gitlab-ci.yml, apps/cic-ussd/.gitlab-ci.yml files --- .gitlab-ci.yml | 8 ++++---- apps/cic-cache/.gitlab-ci.yml | 1 + apps/cic-eth/.gitlab-ci.yml | 2 +- apps/cic-meta/.gitlab-ci.yml | 2 +- apps/cic-notify/.gitlab-ci.yml | 1 + apps/cic-ussd/.gitlab-ci.yml | 1 + apps/contract-migration/.gitlab-ci.yml | 4 ++-- apps/data-seeding/.gitlab-ci.yml | 3 ++- 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 321d5559..52f8ffd6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,10 +2,10 @@ include: - local: 'ci_templates/.cic-template.yml' - local: 'apps/contract-migration/.gitlab-ci.yml' - local: 'apps/cic-eth/.gitlab-ci.yml' - # - local: 'apps/cic-ussd/.gitlab-ci.yml' - # - local: 'apps/cic-notify/.gitlab-ci.yml' - # - local: 'apps/cic-meta/.gitlab-ci.yml' - # - local: 'apps/cic-cache/.gitlab-ci.yml' + - local: 'apps/cic-ussd/.gitlab-ci.yml' + - local: 'apps/cic-notify/.gitlab-ci.yml' + - local: 'apps/cic-meta/.gitlab-ci.yml' + - local: 'apps/cic-cache/.gitlab-ci.yml' - local: 'apps/data-seeding/.gitlab-ci.yml' stages: diff --git a/apps/cic-cache/.gitlab-ci.yml b/apps/cic-cache/.gitlab-ci.yml index 7329ec13..ce16d38b 100644 --- a/apps/cic-cache/.gitlab-ci.yml +++ b/apps/cic-cache/.gitlab-ci.yml @@ -2,6 +2,7 @@ variables: APP_NAME: cic-cache DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile + CONTEXT: apps build-mr-cic-cache: extends: diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml index ef2b02ce..188f0e42 100644 --- a/apps/cic-eth/.gitlab-ci.yml +++ b/apps/cic-eth/.gitlab-ci.yml @@ -2,7 +2,7 @@ variables: APP_NAME: cic-eth DOCKERFILE_PATH: docker/Dockerfile_ci - CONTEXT: $CI_PROJECT_DIR/apps/$APP_NAME + CONTEXT: apps/$APP_NAME build-mr-cic-eth: extends: diff --git a/apps/cic-meta/.gitlab-ci.yml b/apps/cic-meta/.gitlab-ci.yml index 7aac4f90..85c33ad5 100644 --- a/apps/cic-meta/.gitlab-ci.yml +++ b/apps/cic-meta/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: APP_NAME: cic-meta DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile - IMAGE_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:unittest-$CI_COMMIT_SHORT_SHA + CONTEXT: apps build-mr-cic-meta: extends: diff --git a/apps/cic-notify/.gitlab-ci.yml b/apps/cic-notify/.gitlab-ci.yml index 153f0d47..73d3bf14 100644 --- a/apps/cic-notify/.gitlab-ci.yml +++ b/apps/cic-notify/.gitlab-ci.yml @@ -2,6 +2,7 @@ variables: APP_NAME: cic-notify DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile + CONTEXT: apps/ build-mr-cic-notify: extends: diff --git a/apps/cic-ussd/.gitlab-ci.yml b/apps/cic-ussd/.gitlab-ci.yml index 99ad5e29..f020ec2d 100644 --- a/apps/cic-ussd/.gitlab-ci.yml +++ b/apps/cic-ussd/.gitlab-ci.yml @@ -2,6 +2,7 @@ variables: APP_NAME: cic-ussd DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile + CONTEXT: apps/ build-mr-cic-ussd: extends: diff --git a/apps/contract-migration/.gitlab-ci.yml b/apps/contract-migration/.gitlab-ci.yml index 14f12262..d48f7933 100644 --- a/apps/contract-migration/.gitlab-ci.yml +++ b/apps/contract-migration/.gitlab-ci.yml @@ -1,8 +1,8 @@ .contract_migration_variables: variables: APP_NAME: contract-migration - DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci - CONTEXT: $CI_PROJECT_DIR/apps/$APP_NAME + DOCKERFILE_PATH: docker/Dockerfile_ci + CONTEXT: apps/$APP_NAME build-mr-contract-migration: extends: diff --git a/apps/data-seeding/.gitlab-ci.yml b/apps/data-seeding/.gitlab-ci.yml index eebf7a47..1554b922 100644 --- a/apps/data-seeding/.gitlab-ci.yml +++ b/apps/data-seeding/.gitlab-ci.yml @@ -1,7 +1,8 @@ .data_seeding_variables: variables: APP_NAME: data-seeding - DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci + DOCKERFILE_PATH: docker/Dockerfile_ci + CONTEXT: apps/$APP_NAME build-mr-data-seeding: extends: From 0c842cf5d7ae9558617aea3b9dc3ebcd88ea74fa Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 20:28:29 +0000 Subject: [PATCH 15/19] Update apps/cic-ussd/.gitlab-ci.yml --- apps/cic-ussd/.gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/cic-ussd/.gitlab-ci.yml b/apps/cic-ussd/.gitlab-ci.yml index f020ec2d..463381ae 100644 --- a/apps/cic-ussd/.gitlab-ci.yml +++ b/apps/cic-ussd/.gitlab-ci.yml @@ -6,7 +6,6 @@ build-mr-cic-ussd: extends: - - .cic_ussd_changes_target - .py_build_merge_request - .cic_ussd_variables rules: From c35e230e9f56447d7bea080c24760cfb45e32f9b Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 20:29:06 +0000 Subject: [PATCH 16/19] Update apps/cic-notify/.gitlab-ci.yml --- apps/cic-notify/.gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/cic-notify/.gitlab-ci.yml b/apps/cic-notify/.gitlab-ci.yml index 73d3bf14..5f29fa0f 100644 --- a/apps/cic-notify/.gitlab-ci.yml +++ b/apps/cic-notify/.gitlab-ci.yml @@ -6,7 +6,6 @@ build-mr-cic-notify: extends: - - .cic_notify_changes_target - .py_build_merge_request - .cic_notify_variables rules: From 635ef775df88744bf39dbf57d24ac5ca7da11f47 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 20:30:12 +0000 Subject: [PATCH 17/19] Update apps/cic-meta/.gitlab-ci.yml --- apps/cic-meta/.gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/cic-meta/.gitlab-ci.yml b/apps/cic-meta/.gitlab-ci.yml index 85c33ad5..4f9fd61d 100644 --- a/apps/cic-meta/.gitlab-ci.yml +++ b/apps/cic-meta/.gitlab-ci.yml @@ -18,7 +18,6 @@ build-mr-cic-meta: test-mr-cic-meta: extends: - .cic_meta_variables - - .cic_meta_changes_target stage: test image: $MR_IMAGE_TAG script: From b94116a683f685e87f84bc96bdacafa903e18a55 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 20:31:12 +0000 Subject: [PATCH 18/19] Update apps/cic-meta/.gitlab-ci.yml --- apps/cic-meta/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/cic-meta/.gitlab-ci.yml b/apps/cic-meta/.gitlab-ci.yml index 4f9fd61d..730b00a8 100644 --- a/apps/cic-meta/.gitlab-ci.yml +++ b/apps/cic-meta/.gitlab-ci.yml @@ -25,7 +25,7 @@ test-mr-cic-meta: - npm install --dev - npm run test - npm run test:coverage - needs: ["cic-meta-build-mr"] + needs: ["build-mr-cic-meta"] rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: From e40f15d10682d2e141deb713dd13735f9f435e02 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 6 Jul 2021 20:41:57 +0000 Subject: [PATCH 19/19] Update apps/contract-migration/.gitlab-ci.yml, apps/data-seeding/.gitlab-ci.yml files --- apps/contract-migration/.gitlab-ci.yml | 4 ++-- apps/data-seeding/.gitlab-ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/contract-migration/.gitlab-ci.yml b/apps/contract-migration/.gitlab-ci.yml index d48f7933..4e3c5153 100644 --- a/apps/contract-migration/.gitlab-ci.yml +++ b/apps/contract-migration/.gitlab-ci.yml @@ -1,8 +1,8 @@ .contract_migration_variables: variables: APP_NAME: contract-migration - DOCKERFILE_PATH: docker/Dockerfile_ci - CONTEXT: apps/$APP_NAME + DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci + CONTEXT: apps/ build-mr-contract-migration: extends: diff --git a/apps/data-seeding/.gitlab-ci.yml b/apps/data-seeding/.gitlab-ci.yml index 1554b922..d4ec07b0 100644 --- a/apps/data-seeding/.gitlab-ci.yml +++ b/apps/data-seeding/.gitlab-ci.yml @@ -1,8 +1,8 @@ .data_seeding_variables: variables: APP_NAME: data-seeding - DOCKERFILE_PATH: docker/Dockerfile_ci - CONTEXT: apps/$APP_NAME + DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci + CONTEXT: apps/ build-mr-data-seeding: extends: