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.

Sign up for GitHub

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

Test bootstrap restore in CI #2061

Merged
merged 12 commits into from
Jun 2, 2020
Merged

Test bootstrap restore in CI #2061

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
065b6ff
scripts: Re-generate all certificate needed for Salt master
TeddyAndrieux May 20, 2020
273a1b6
scripts: Re-configure apiserver-proxy on all nodes during restore
TeddyAndrieux May 25, 2020
774ce0f
tests/ci: add a second node to expansion tests if node2
alexandre-allard Jan 23, 2020
2177dc4
tests/ci: pass backup archive env var to pytest
alexandre-allard Jan 23, 2020
9155b13
tests: add a get_grain helper and use it everywhere
alexandre-allard May 15, 2020
e194582
tests: move check_etcd_role definition to conftest
alexandre-allard Jan 24, 2020
5740ee8
ci: Add extra_opts for wait running Pods
TeddyAndrieux May 18, 2020
be18d3e
ci: create volumes on node1 instead of bootstrap for multi-node
alexandre-allard Feb 6, 2020
d97fc25
ci: copy bastion pub key to authorized keys to a list of nodes
alexandre-allard Feb 3, 2020
ca8b522
tests: no longer check kube-dns node
alexandre-allard Feb 10, 2020
4b7a967
tests/ci: add tests scenario for bootstrap restoration
alexandre-allard Jan 24, 2020
0293ddd
ci: add bootstrap restore tests in CI
TeddyAndrieux May 18, 2020
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
2 changes: 1 addition & 1 deletion eve/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1597,7 +1597,7 @@ stages:
name: Run installation scenarii on the bastion
env:
<<: *_env_bastion_tests
PYTEST_FILTERS: "install and ci and multinodes"
PYTEST_FILTERS: "install and ci and multinodes and not node2"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beurk. Let's keep it, but really not what BDD tags should be used for, IMHO

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes but we do not have better solution here for expansion right now I think

- ShellCommand:
<<: *bastion_tests
name: Run fast tests on the bastion
Expand Down
19 changes: 18 additions & 1 deletion tests/install/features/expansion.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@install @ci @local @multinodes
Feature: Cluster expansion
Scenario: Add one node to the cluster
Background:
Given the Kubernetes API is available

Scenario: Add one node to the cluster
When we declare a new "control-plane" node on host "node1"
Then node "node1" is registered in Kubernetes
And node "node1" status is "NotReady"
Expand All @@ -14,3 +16,18 @@ Feature: Cluster expansion
And we have 1 running pod labeled 'k8s-app=kube-proxy' in namespace 'kube-system' on node 'node1'
And we have 1 running pod labeled 'component=etcd' in namespace 'kube-system' on node 'node1'
And node "node1" is a member of etcd cluster

@node2
Scenario: Add a second node to the cluster
When we declare a new "control-plane" node on host "node2"
Then node "node2" is registered in Kubernetes
And node "node2" status is "NotReady"
When we deploy the node "node2"
Then node "node2" status is "Ready"
And we have 1 running pod labeled 'component=kube-controller-manager' in namespace 'kube-system' on node 'node2'
And we have 1 running pod labeled 'component=kube-scheduler' in namespace 'kube-system' on node 'node2'
And we have 1 running pod labeled 'component=kube-apiserver' in namespace 'kube-system' on node 'node2'
And we have 1 running pod labeled 'k8s-app=calico-node' in namespace 'kube-system' on node 'node2'
And we have 1 running pod labeled 'k8s-app=kube-proxy' in namespace 'kube-system' on node 'node2'
And we have 1 running pod labeled 'component=etcd' in namespace 'kube-system' on node 'node2'
And node "node2" is a member of etcd cluster
7 changes: 6 additions & 1 deletion tests/install/steps/test_expansion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@

# Scenarios
@scenario('../features/expansion.feature', 'Add one node to the cluster')
def test_cluster_expansion(host):
def test_cluster_expansion_1_node(host):
pass


@scenario('../features/expansion.feature', 'Add a second node to the cluster')
def test_cluster_expansion_2_nodes(host):
pass

# When {{{
Expand Down