.gitlab/integration_test.gitlab-ci.yml

@@ -191,23 +191,27 @@ test_results:
   rules:
 
     - if: $CI_COMMIT_TAG
+      allow_failure: true
       when: on_success
 
-    - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
+    # Needs to run, even by bot as the test results need to be available
-      when: never
+    # - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
+    #   when: never
 
     - if: # Occur on merge
-        $CI_COMMIT_BRANCH == "development"
+        $CI_COMMIT_BRANCH
           &&
         $CI_PIPELINE_SOURCE == "push"
-      when: always
+      allow_failure: true
+      when: on_success
 
-    - if:
+    # - if:
-        $CI_COMMIT_BRANCH != "development"
+    #     $CI_COMMIT_BRANCH != "development"
-          &&
+    #       &&
-        $CI_COMMIT_BRANCH != "master"
+    #     $CI_COMMIT_BRANCH != "master"
-          &&
+    #       &&
-        $CI_PIPELINE_SOURCE == "push"
+    #     $CI_PIPELINE_SOURCE == "push"
-      when: always
+    #   allow_failure: true
+    #   when: always
 
     - when: never

roles/nfc_kubernetes/tasks/helm/main.yaml

@@ -5,6 +5,7 @@
     url: https://baltocdn.com/helm/signing.asc
     dest: /usr/share/keyrings/helm.asc
     mode: 740
+  changed_when: not ansible_check_mode
   delay: 10
   retries: 3
 

roles/nfc_kubernetes/tasks/install.yaml

@@ -4,6 +4,7 @@
   ansible.builtin.command:
     cmd: hostname
   changed_when: false
+  check_mode: false
   register: hostname_to_check
   tags:
     - always
@@ -18,8 +19,6 @@
     - always
   when: >
     inventory_hostname != 'localhost'
-      and
-    not ansible_check_mode
 
 
 - name: Testing Env Variables
@@ -27,6 +26,7 @@
     ansible_default_ipv4: {
       "address": "127.0.0.1"
     }
+  check_mode: false
   tags:
     - always
   when: >

roles/nfc_kubernetes/tasks/k3s/install.yaml

@@ -274,6 +274,7 @@
 
     executable: /bin/bash
   changed_when: false
+  check_mode: false
   failed_when: false
   register: k3s_metadata
 
@@ -320,6 +321,8 @@
       - 304
     dest: "/tmp/k3s.{{ cpu_arch.key }}"
     mode: "744"
+  changed_when: not ansible_check_mode
+  check_mode: false
   delay: 10
   retries: 3
   register: k3s_download_files
@@ -395,6 +398,7 @@
       - 304
     dest: "{{ item.dest }}"
     mode: "744"
+  check_mode: false
   changed_when: false
   delay: 10
   retries: 3
@@ -600,6 +604,8 @@
   failed_when: kubernetes_ready_check.rc != 0
   when: >
     not nfc_role_kubernetes_cluster_upgraded | default(false) | bool
+      and
+    not ansible_check_mode
 
 
 - name: Config Link

roles/nfc_kubernetes/tasks/k3s/migrate_to_operator.yaml

@@ -110,6 +110,7 @@
         owner: root
         group: 'root'
       changed_when: false
+      check_mode: false
       become: true
       delegate_to: localhost
       loop: "{{ nfc_kubernetes_install_architectures | dict2items }}"