Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files

This commit is contained in:
Blair Vanderlugt 2021-05-21 16:39:28 +00:00
parent dad40c993c
commit 8355347323
2 changed files with 16 additions and 16 deletions

View File

@ -8,11 +8,11 @@
- changes:
- $CONTEXT/$APP_NAME/*
build-mr-cic-eth:
extends:
- .cic_eth_changes_target
- .py_build_merge_request
- .cic_eth_variables
# build-mr-cic-eth:
# extends:
# - .cic_eth_changes_target
# - .py_build_merge_request
# - .cic_eth_variables
build-mr-unittest-cic-eth:
extends:

View File

@ -6,17 +6,17 @@ variables:
KANIKO_CACHE_ARGS: "--cache=false --cache-copy-layers=true --cache-ttl=24h"
CONTEXT: $CI_PROJECT_DIR/apps/
# .py_build_merge_request:
# stage: build
# variables:
# CI_DEBUG_TRACE: "true"
# 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 --cache-repo $CI_REGISTRY_IMAGE --no-push
# rules:
# - if: $CI_PIPELINE_SOURCE == "merge_request_event"
# when: always
.py_build_merge_request:
stage: build
variables:
CI_DEBUG_TRACE: "true"
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 --cache-repo $CI_REGISTRY_IMAGE --no-push
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: always
.py_build_unittest_merge_request:
stage: build