From 5efd9807f63152e407f29fcf5bcfbaefc7b1eecf Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 25 Apr 2024 16:24:31 +0930 Subject: [PATCH 1/2] fix(nfc_kubernetes): adjust some tasks to run during checkmode these tasks make no change and are required for checkmode to function as it's intended !59 fixes #26 --- roles/nfc_kubernetes/tasks/helm/main.yaml | 1 + roles/nfc_kubernetes/tasks/install.yaml | 4 ++-- roles/nfc_kubernetes/tasks/k3s/install.yaml | 6 ++++++ roles/nfc_kubernetes/tasks/k3s/migrate_to_operator.yaml | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/roles/nfc_kubernetes/tasks/helm/main.yaml b/roles/nfc_kubernetes/tasks/helm/main.yaml index cb55052..954db2d 100644 --- a/roles/nfc_kubernetes/tasks/helm/main.yaml +++ b/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 diff --git a/roles/nfc_kubernetes/tasks/install.yaml b/roles/nfc_kubernetes/tasks/install.yaml index 6637c3a..22ca927 100644 --- a/roles/nfc_kubernetes/tasks/install.yaml +++ b/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: > diff --git a/roles/nfc_kubernetes/tasks/k3s/install.yaml b/roles/nfc_kubernetes/tasks/k3s/install.yaml index 4313d92..8a11cc0 100644 --- a/roles/nfc_kubernetes/tasks/k3s/install.yaml +++ b/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 diff --git a/roles/nfc_kubernetes/tasks/k3s/migrate_to_operator.yaml b/roles/nfc_kubernetes/tasks/k3s/migrate_to_operator.yaml index 4a30496..724b3a5 100644 --- a/roles/nfc_kubernetes/tasks/k3s/migrate_to_operator.yaml +++ b/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 }}" -- 2.49.0 From f622228493a7b4b8335c9a63243ff8c37601f4f3 Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 25 Apr 2024 16:27:38 +0930 Subject: [PATCH 2/2] ci(tests): correct so they are always available on all branches intended !59 --- .gitlab/integration_test.gitlab-ci.yml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitlab/integration_test.gitlab-ci.yml b/.gitlab/integration_test.gitlab-ci.yml index db1b94f..ffc45a8 100644 --- a/.gitlab/integration_test.gitlab-ci.yml +++ b/.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 '" - when: never + # Needs to run, even by bot as the test results need to be available + # - if: "$CI_COMMIT_AUTHOR =='nfc_bot '" + # 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: - $CI_COMMIT_BRANCH != "development" - && - $CI_COMMIT_BRANCH != "master" - && - $CI_PIPELINE_SOURCE == "push" - when: always + # - if: + # $CI_COMMIT_BRANCH != "development" + # && + # $CI_COMMIT_BRANCH != "master" + # && + # $CI_PIPELINE_SOURCE == "push" + # allow_failure: true + # when: always - when: never \ No newline at end of file -- 2.49.0