From 8355347323e7705fec9cd9b3ed9f2c16bdee0e88 Mon Sep 17 00:00:00 2001
From: Blair Vanderlugt <blair.vanderlugt@gmail.com>
Date: Fri, 21 May 2021 16:39:28 +0000
Subject: [PATCH] Update ci_templates/.cic-template.yml,
 apps/cic-eth/.gitlab-ci.yml files

---
 apps/cic-eth/.gitlab-ci.yml    | 10 +++++-----
 ci_templates/.cic-template.yml | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml
index f41073b1..5491260b 100644
--- a/apps/cic-eth/.gitlab-ci.yml
+++ b/apps/cic-eth/.gitlab-ci.yml
@@ -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:
diff --git a/ci_templates/.cic-template.yml b/ci_templates/.cic-template.yml
index 93950f22..9ebd3233 100644
--- a/ci_templates/.cic-template.yml
+++ b/ci_templates/.cic-template.yml
@@ -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