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

This commit is contained in:
Blair Vanderlugt 2021-07-06 17:15:24 +00:00
parent 460a7c223b
commit 068d1112d2
2 changed files with 13 additions and 12 deletions

View File

@ -14,7 +14,7 @@ build-mr-cic-eth:
extends: extends:
- .cic_eth_variables - .cic_eth_variables
- .cic_eth_changes_target - .cic_eth_changes_target
- .py_build_merge_request - .py_build_target_dev
test-mr-cic-eth: test-mr-cic-eth:
stage: test stage: test

View File

@ -19,17 +19,18 @@ variables:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: always when: always
# .py_build_target_test: .py_build_target_dev:
# stage: build stage: build
# variables: variables:
# CI_DEBUG_TRACE: "true" CI_DEBUG_TRACE: "true"
# script: IMAGE_TAG: $CI_REGISTRY_IMAGE/mergerequest/$APP_NAME:$CI_COMMIT_SHORT_SHA
# - mkdir -p /kaniko/.docker script:
# - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json" - mkdir -p /kaniko/.docker
# - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --cache-repo $CI_REGISTRY_IMAGE --target test --tarPath $APP_NAME-test-image.tar --destination $CI_REGISTRY_IMAGE/$APP_NAME-test:latest - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
# rules: - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --cache-repo $CI_REGISTRY_IMAGE --target dev --tarPath $APP_NAME-test-image.tar --destination $IMAGE_TAG
# - if: $CI_PIPELINE_SOURCE == "merge_request_event" rules:
# when: always - if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: always
.py_build_push: .py_build_push:
stage: build stage: build