Fix the gilab-ci

mxenabled · Dec 18, 2023 · 04e949a · 04e949a
1 parent c2eb535
commit 04e949a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,9 +8,12 @@ variables:
   ARTIFACTORY_URL: "https://docker-local.artifactory.internal.mx/"
 
 build-feature:
-  only:
-    - branches
-  when: manual
+  rules:
+  - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    when: never
+  - if: $CI_COMMIT_MESSAGE =~ /BUILD_FEATURE_BRANCH/i
+    when: always
+  - when: manual
   before_script:
     - docker login -u gitlabci -p "{JWT}${CI_JOB_JWT}" $MX_REGISTRY
   script:
@@ -30,18 +33,3 @@ build:
   script:
     - docker build -t "$IMG" .
     - docker push "$IMG"
-
-build-on-commit:
-  before_script:
-    - docker login -u gitlabci -p "{JWT}${CI_JOB_JWT}" $MX_REGISTRY
-  script:
-    - docker build -t "$IMG" .
-    - docker push "$IMG"
-  only:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /BUILD_FEATURE_BRANCH/i
-    refs:
-      - branches
-  except:
-    variables:
-      - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
diff --git a/docbot-crd/src/pod_template.rs b/docbot-crd/src/pod_template.rs
@@ -13,7 +13,7 @@ use std::num::NonZeroUsize;
 use std::sync::Arc;
 use tokio::sync::broadcast;
 use tokio::sync::Mutex;
-use tracing::{error, info, warn};
+use tracing::{info, warn};
 
 #[derive(Clone)]
 pub struct PodTemplateService {