Merge branch '14-k3s-upgrades' into 'development'

test: fixing of deb 12

See merge request nofusscomputing/projects/ansible/collections/kubernetes!55

.gitlab-ci.yml

@@ -22,6 +22,40 @@ include:
       - automation/.gitlab-ci-ansible.yaml
 
 
+Build Collection:
+  extends: .ansible_collection_build
+  needs:
+    - job: Ansible Lint
+      optional: true
+    - job: Ansible Lint (galaxy.yml)
+      optional: true
+
+  rules:
+
+    - if: $CI_COMMIT_TAG
+      when: always
+
+    # Needs to run, even by bot as the test results need to be available
+    # - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
+    #   when: never
+
+    - if: # Occur on merge
+        $CI_COMMIT_BRANCH
+          &&
+        $CI_PIPELINE_SOURCE == "push"
+      when: always
+
+    # - if:
+    #     $CI_COMMIT_BRANCH != "development"
+    #       &&
+    #     $CI_COMMIT_BRANCH != "master"
+    #       &&
+    #     $CI_PIPELINE_SOURCE == "push"
+    #   when: always
+
+    - when: never
+
+
 Update Git Submodules:
   extends: .ansible_playbook_git_submodule
 

.gitlab/integration_test.gitlab-ci.yml

@@ -30,6 +30,7 @@
         --env "ANSIBLE_FORCE_COLOR=true" \
         --env "CI_COMMIT_SHA=${CI_COMMIT_SHA}" \
         --env "ANSIBLE_LOG_PATH=/workdir/ansible.log" \
+        --env "PIP_BREAK_SYSTEM_PACKAGES=1" \
         --name test_image_${CI_JOB_ID} \
         nofusscomputing/ansible-docker-os:dev-${test_image}
 
@@ -45,6 +46,10 @@
 
         docker exec -i test_image_${CI_JOB_ID} pip install ansible-core --break-system-packages;
 
+        docker exec -i test_image_${CI_JOB_ID} mkdir -p /etc/iptables;
+
+        docker exec -i test_image_${CI_JOB_ID} touch /etc/iptables/rules.v6;
+
         docker exec -i test_image_${CI_JOB_ID} update-alternatives --set iptables /usr/sbin/iptables-legacy;
 
       else
@@ -124,24 +129,25 @@
       allow_failure: true
       when: on_success
 
-    - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
-      when: never
+    # Needs to run, even by bot as the test results need to be available
+    # - 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"
       allow_failure: true
-      when: always
+      when: on_success
 
-    - if:
-        $CI_COMMIT_BRANCH != "development"
-          &&
-        $CI_COMMIT_BRANCH != "master"
-          &&
-        $CI_PIPELINE_SOURCE == "push"
-      allow_failure: true
-      when: always
+    # - if:
+    #     $CI_COMMIT_BRANCH != "development"
+    #       &&
+    #     $CI_COMMIT_BRANCH != "master"
+    #       &&
+    #     $CI_PIPELINE_SOURCE == "push"
+    #   allow_failure: true
+    #   when: always
 
     - when: never
 

.gitlab/integration_test_trace.sh

@@ -31,7 +31,7 @@ cmd "journalctl -xeu k3s.service"
 
 cmd "systemctl status netfilter-persistent.service"
 
-cmd "systemctl status iptables.servic"
+cmd "systemctl status iptables.service"
 
 cmd "systemctl status k3s.service"