Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
3f62492a
Commit
3f62492a
authored
5 years ago
by
Maxime Guyot
Committed by
Kubernetes Prow Robot
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Use standard testcases job for TF CI (#4732)
parent
5e3bd2df
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci/terraform.yml
+3
-5
3 additions, 5 deletions
.gitlab-ci/terraform.yml
tests/files/tf-ovh_ubuntu18-calico.yml
+3
-0
3 additions, 0 deletions
tests/files/tf-ovh_ubuntu18-calico.yml
tests/testcases/010_check-apiserver.yml
+2
-2
2 additions, 2 deletions
tests/testcases/010_check-apiserver.yml
with
8 additions
and
7 deletions
.gitlab-ci/terraform.yml
+
3
−
5
View file @
3f62492a
...
...
@@ -36,10 +36,7 @@
ANSIBLE_INVENTORY
:
hosts
CI_PLATFORM
:
tf
script
:
-
cd tests && make create-${CI_PLATFORM} -s ; cd -
-
ansible-playbook tests/cloud_playbooks/wait-for-ssh.yml
-
ansible-playbook cluster.yml --become
# - tests/scripts/testcases_prepare.sh
-
tests/scripts/testcases_run.sh
after_script
:
# Cleanup regardless of exit code
-
./tests/scripts/testcases_cleanup.sh
...
...
@@ -106,7 +103,7 @@ tf-packet-ubuntu18-default:
OS_INTERFACE
:
public
OS_IDENTITY_API_VERSION
:
"
3"
tf-
apply-ovh
:
tf-
ovh_ubuntu18-calico
:
extends
:
.terraform_apply
when
:
on_success
variables
:
...
...
@@ -115,6 +112,7 @@ tf-apply-ovh:
PROVIDER
:
openstack
CLUSTER
:
$CI_COMMIT_REF_NAME
ANSIBLE_TIMEOUT
:
"
60"
SSH_USER
:
ubuntu
TF_VAR_cluster_name
:
$CI_COMMIT_REF_SLUG
TF_VAR_number_of_k8s_masters
:
"
0"
TF_VAR_number_of_k8s_masters_no_floating_ip
:
"
1"
...
...
This diff is collapsed.
Click to expand it.
tests/files/tf-ovh_ubuntu18-calico.yml
0 → 100644
+
3
−
0
View file @
3f62492a
---
dns_min_replicas
:
1
deploy_netchecker
:
true
This diff is collapsed.
Click to expand it.
tests/testcases/010_check-apiserver.yml
+
2
−
2
View file @
3f62492a
...
...
@@ -4,8 +4,8 @@
tasks
:
-
name
:
Check the API servers are responding
uri
:
url
:
"
https://{{
access_ip
|
default(ansible_default_ipv4.address)
}}:{{
kube_apiserver_port
}}/api/v1"
url
:
"
https://{{
access_ip
|
default(ansible_default_ipv4.address)
}}:{{
kube_apiserver_port
|
default(6443)
}}/api/v1"
user
:
kube
password
:
"
{{
lookup('password',
credentials_dir
+
'/kube_user.creds
length=15
chars=ascii_letters,digits')
}}"
password
:
"
{{
lookup('password',
credentials_dir
|
default(inventory_dir
+
'/credentials')
+
'/kube_user.creds
length=15
chars=ascii_letters,digits')
}}"
validate_certs
:
no
status_code
:
200,401,403
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment