Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(keys): drop authorized_keys tests from microk8s #204

Merged
merged 1 commit into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
292 changes: 0 additions & 292 deletions jobs/ci-run/integration/gen/test-authorized_keys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions tools/gen-wire-tests/juju.config
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ folders:
- actions
- agents
- appdata
- authorized_keys
- backup
- bootstrap
- branches
Expand Down
Loading