From d85c29ad02c6140f98f765385645cd0ef0363b69 Mon Sep 17 00:00:00 2001 From: Jack Shaw Date: Thu, 10 Oct 2024 15:00:04 +0100 Subject: [PATCH] refactor(keys): drop authorized_keys tests from microk8s These tests are machine controller specific. They break when running against microk8s --- .../integration/gen/test-authorized_keys.yml | 292 ------------------ tools/gen-wire-tests/juju.config | 1 + 2 files changed, 1 insertion(+), 292 deletions(-) diff --git a/jobs/ci-run/integration/gen/test-authorized_keys.yml b/jobs/ci-run/integration/gen/test-authorized_keys.yml index d324387..bf0a937 100644 --- a/jobs/ci-run/integration/gen/test-authorized_keys.yml +++ b/jobs/ci-run/integration/gen/test-authorized_keys.yml @@ -40,8 +40,6 @@ current-parameters: true - name: 'test-authorized_keys-test-bootstrap-authorized-keys-lxd' current-parameters: true - - name: 'test-authorized_keys-test-bootstrap-authorized-keys-microk8s' - current-parameters: true - name: 'test-authorized_keys-test-machine-ssh-aws' current-parameters: true - name: 'test-authorized_keys-test-machine-ssh-azure' @@ -50,8 +48,6 @@ current-parameters: true - name: 'test-authorized_keys-test-machine-ssh-lxd' current-parameters: true - - name: 'test-authorized_keys-test-machine-ssh-microk8s' - current-parameters: true - name: 'test-authorized_keys-test-migrate-authorized-keys-aws' current-parameters: true - name: 'test-authorized_keys-test-migrate-authorized-keys-azure' @@ -60,8 +56,6 @@ current-parameters: true - name: 'test-authorized_keys-test-migrate-authorized-keys-lxd' current-parameters: true - - name: 'test-authorized_keys-test-migrate-authorized-keys-microk8s' - current-parameters: true - name: 'test-authorized_keys-test-user-ssh-keys-aws' current-parameters: true - name: 'test-authorized_keys-test-user-ssh-keys-azure' @@ -70,8 +64,6 @@ current-parameters: true - name: 'test-authorized_keys-test-user-ssh-keys-lxd' current-parameters: true - - name: 'test-authorized_keys-test-user-ssh-keys-microk8s' - current-parameters: true - job: name: test-authorized_keys-test-bootstrap-authorized-keys-aws @@ -381,80 +373,6 @@ publishers: - integration-artifacts -- job: - name: test-authorized_keys-test-bootstrap-authorized-keys-microk8s - node: ephemeral-noble-8c-32g-amd64 - description: |- - Test test_bootstrap_authorized_keys in authorized_keys suite on microk8s - parameters: - - validating-string: - name: SHORT_GIT_COMMIT - description: 'Enable sub job to be run individually.' - regex: ^\S{{7}}$ - msg: Enter a valid 7 char git sha - - choice: - default: 'amd64' - description: 'Build arch used to download the build tar.gz.' - name: BUILD_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - choice: - default: '' - description: 'Arch used to boostrap controller.' - name: BOOTSTRAP_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - choice: - default: '' - description: 'Arch used for hosted models.' - name: MODEL_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - string: - default: 'microk8s' - description: 'Cloud to use when bootstrapping Juju' - name: BOOTSTRAP_CLOUD - - string: - default: 'k8s' - description: 'Provider to use when bootstrapping Juju' - name: BOOTSTRAP_PROVIDER - - string: - default: '' - description: 'Ubuntu series to use when bootstrapping Juju' - name: BOOTSTRAP_SERIES - wrappers: - - default-integration-test-wrapper - - timeout: - timeout: 30 - fail: true - type: absolute - builders: - - select-oci-registry - - wait-for-cloud-init - - prepare-integration-test - - conditional-step: - condition-kind: regex-match - regex: "^[5-9].*|^4\\.([0-9]|\\d{{2,}})(\\.|-).*" - label: "${{JUJU_VERSION}}" - on-evaluation-failure: "dont-run" - steps: - - run-integration-test-microk8s: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_bootstrap_authorized_keys' - skip_tasks: 'test_machine_ssh,test_migrate_authorized_keys,test_user_ssh_keys' - publishers: - - integration-artifacts - - job: name: test-authorized_keys-test-machine-ssh-aws node: ephemeral-noble-small-amd64 @@ -739,74 +657,6 @@ publishers: - integration-artifacts -- job: - name: test-authorized_keys-test-machine-ssh-microk8s - node: ephemeral-noble-8c-32g-amd64 - description: |- - Test test_machine_ssh in authorized_keys suite on microk8s - parameters: - - validating-string: - name: SHORT_GIT_COMMIT - description: 'Enable sub job to be run individually.' - regex: ^\S{{7}}$ - msg: Enter a valid 7 char git sha - - choice: - default: 'amd64' - description: 'Build arch used to download the build tar.gz.' - name: BUILD_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - choice: - default: '' - description: 'Arch used to boostrap controller.' - name: BOOTSTRAP_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - choice: - default: '' - description: 'Arch used for hosted models.' - name: MODEL_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - string: - default: 'microk8s' - description: 'Cloud to use when bootstrapping Juju' - name: BOOTSTRAP_CLOUD - - string: - default: 'k8s' - description: 'Provider to use when bootstrapping Juju' - name: BOOTSTRAP_PROVIDER - - string: - default: '' - description: 'Ubuntu series to use when bootstrapping Juju' - name: BOOTSTRAP_SERIES - wrappers: - - default-integration-test-wrapper - - timeout: - timeout: 30 - fail: true - type: absolute - builders: - - select-oci-registry - - wait-for-cloud-init - - prepare-integration-test - - run-integration-test-microk8s: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_machine_ssh' - skip_tasks: 'test_bootstrap_authorized_keys,test_migrate_authorized_keys,test_user_ssh_keys' - publishers: - - integration-artifacts - - job: name: test-authorized_keys-test-migrate-authorized-keys-aws node: ephemeral-noble-small-amd64 @@ -1115,80 +965,6 @@ publishers: - integration-artifacts -- job: - name: test-authorized_keys-test-migrate-authorized-keys-microk8s - node: ephemeral-noble-8c-32g-amd64 - description: |- - Test test_migrate_authorized_keys in authorized_keys suite on microk8s - parameters: - - validating-string: - name: SHORT_GIT_COMMIT - description: 'Enable sub job to be run individually.' - regex: ^\S{{7}}$ - msg: Enter a valid 7 char git sha - - choice: - default: 'amd64' - description: 'Build arch used to download the build tar.gz.' - name: BUILD_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - choice: - default: '' - description: 'Arch used to boostrap controller.' - name: BOOTSTRAP_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - choice: - default: '' - description: 'Arch used for hosted models.' - name: MODEL_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - string: - default: 'microk8s' - description: 'Cloud to use when bootstrapping Juju' - name: BOOTSTRAP_CLOUD - - string: - default: 'k8s' - description: 'Provider to use when bootstrapping Juju' - name: BOOTSTRAP_PROVIDER - - string: - default: '' - description: 'Ubuntu series to use when bootstrapping Juju' - name: BOOTSTRAP_SERIES - wrappers: - - default-integration-test-wrapper - - timeout: - timeout: 30 - fail: true - type: absolute - builders: - - select-oci-registry - - wait-for-cloud-init - - prepare-integration-test - - conditional-step: - condition-kind: regex-match - regex: "^[5-9].*|^4\\.([0-9]|\\d{{2,}})(\\.|-).*" - label: "${{JUJU_VERSION}}" - on-evaluation-failure: "dont-run" - steps: - - run-integration-test-microk8s: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_migrate_authorized_keys' - skip_tasks: 'test_bootstrap_authorized_keys,test_machine_ssh,test_user_ssh_keys' - publishers: - - integration-artifacts - - job: name: test-authorized_keys-test-user-ssh-keys-aws node: ephemeral-noble-small-amd64 @@ -1472,71 +1248,3 @@ skip_tasks: 'test_bootstrap_authorized_keys,test_machine_ssh,test_migrate_authorized_keys' publishers: - integration-artifacts - -- job: - name: test-authorized_keys-test-user-ssh-keys-microk8s - node: ephemeral-noble-8c-32g-amd64 - description: |- - Test test_user_ssh_keys in authorized_keys suite on microk8s - parameters: - - validating-string: - name: SHORT_GIT_COMMIT - description: 'Enable sub job to be run individually.' - regex: ^\S{{7}}$ - msg: Enter a valid 7 char git sha - - choice: - default: 'amd64' - description: 'Build arch used to download the build tar.gz.' - name: BUILD_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - choice: - default: '' - description: 'Arch used to boostrap controller.' - name: BOOTSTRAP_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - choice: - default: '' - description: 'Arch used for hosted models.' - name: MODEL_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - string: - default: 'microk8s' - description: 'Cloud to use when bootstrapping Juju' - name: BOOTSTRAP_CLOUD - - string: - default: 'k8s' - description: 'Provider to use when bootstrapping Juju' - name: BOOTSTRAP_PROVIDER - - string: - default: '' - description: 'Ubuntu series to use when bootstrapping Juju' - name: BOOTSTRAP_SERIES - wrappers: - - default-integration-test-wrapper - - timeout: - timeout: 30 - fail: true - type: absolute - builders: - - select-oci-registry - - wait-for-cloud-init - - prepare-integration-test - - run-integration-test-microk8s: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_user_ssh_keys' - skip_tasks: 'test_bootstrap_authorized_keys,test_machine_ssh,test_migrate_authorized_keys' - publishers: - - integration-artifacts diff --git a/tools/gen-wire-tests/juju.config b/tools/gen-wire-tests/juju.config index 04289d1..41568c6 100644 --- a/tools/gen-wire-tests/juju.config +++ b/tools/gen-wire-tests/juju.config @@ -183,6 +183,7 @@ folders: - actions - agents - appdata + - authorized_keys - backup - bootstrap - branches