From 431a14d5b20b92ac4ba52e7b5c67dfb7c887096d Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil-jocelyn.schark@stud.h-da.de>
Date: Wed, 3 Nov 2021 15:38:39 +0100
Subject: [PATCH] wip

---
 .gitlab-ci.yml                  | 2 +-
 .gitlab/ci/.code-quality-ci.yml | 4 ----
 .gitlab/ci/.test.yml            | 3 ---
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c946be75..a2104b7c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,4 +23,4 @@ include:
   - local: '/.gitlab/ci/.containerlab-ci.yml'
   - local: '/.gitlab/ci/.integration-test.yml'
   - local: '/.gitlab/ci/.uml-autogen-ci.yml'
-  - local: '/.gitlab/ci/.deploy-k8s.yml'
+  #- local: '/.gitlab/ci/.deploy-k8s.yml'
diff --git a/.gitlab/ci/.code-quality-ci.yml b/.gitlab/ci/.code-quality-ci.yml
index a608dd15e..4d1f41524 100644
--- a/.gitlab/ci/.code-quality-ci.yml
+++ b/.gitlab/ci/.code-quality-ci.yml
@@ -1,10 +1,6 @@
 code-quality:
   image: golangci/golangci-lint:latest-alpine
   stage: test
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_COMMIT_BRANCH == "develop"
   script:
     # writes golangci-lint output to gl-code-quality-report.json
     - golangci-lint run --config build/ci/.golangci-config/.golangci.yml --out-format code-climate | tee gl-code-quality-report.json
diff --git a/.gitlab/ci/.test.yml b/.gitlab/ci/.test.yml
index f02f6ffe7..b8cbe03a7 100644
--- a/.gitlab/ci/.test.yml
+++ b/.gitlab/ci/.test.yml
@@ -4,9 +4,6 @@
   variables:
     GOSDN_LOG: "nolog"
     GOSDN_CHANGE_TIMEOUT: "100ms"
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-      when: never
 
 unit-test:
   script:
-- 
GitLab