Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
d64f0f11
Commit
d64f0f11
authored
Mar 02, 2015
by
Lénaïc Huard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make libvirt-CoreOS cluster able to run e2e tests
parent
c763fbf9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
3 deletions
+33
-3
config-test.sh
cluster/libvirt-coreos/config-test.sh
+19
-0
util.sh
cluster/libvirt-coreos/util.sh
+7
-2
ginkgo-e2e.sh
hack/ginkgo-e2e.sh
+7
-1
No files found.
cluster/libvirt-coreos/config-test.sh
0 → 100644
View file @
d64f0f11
#!/bin/bash
# Copyright 2014 Google Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
## Contains configuration values for interacting with the Vagrant cluster in test mode
KUBE_ROOT
=
$(
dirname
"
${
BASH_SOURCE
}
"
)
/../..
source
"
${
KUBE_ROOT
}
/cluster/libvirt-coreos/config-default.sh"
cluster/libvirt-coreos/util.sh
View file @
d64f0f11
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
# A library of helper functions that each provider hosting Kubernetes must implement to use cluster/kube-*.sh scripts.
# A library of helper functions that each provider hosting Kubernetes must implement to use cluster/kube-*.sh scripts.
readonly
KUBE_ROOT
=
$(
dirname
"
${
BASH_SOURCE
}
"
)
/../..
KUBE_ROOT
=
$(
dirname
"
${
BASH_SOURCE
}
"
)
/../..
readonly
ROOT
=
$(
dirname
"
${
BASH_SOURCE
}
"
)
readonly
ROOT
=
$(
dirname
"
${
BASH_SOURCE
}
"
)
source
$ROOT
/
${
KUBE_CONFIG_FILE
:-
"config-default.sh"
}
source
$ROOT
/
${
KUBE_CONFIG_FILE
:-
"config-default.sh"
}
...
@@ -277,7 +277,7 @@ function test-setup {
...
@@ -277,7 +277,7 @@ function test-setup {
# Execute after running tests to perform any required clean-up
# Execute after running tests to perform any required clean-up
function
test-teardown
{
function
test-teardown
{
echo
"TODO"
kube-down
}
}
# Set the {KUBE_USER} and {KUBE_PASSWORD} environment values required to interact with provider
# Set the {KUBE_USER} and {KUBE_PASSWORD} environment values required to interact with provider
...
@@ -294,6 +294,11 @@ function teardown-monitoring-firewall {
...
@@ -294,6 +294,11 @@ function teardown-monitoring-firewall {
echo
"TODO"
1>&2
echo
"TODO"
1>&2
}
}
# Perform preparations required to run e2e tests
function
prepare-e2e
()
{
echo
"libvirt-coreos doesn't need special preparations for e2e tests"
1>&2
}
function
setup-logging-firewall
{
function
setup-logging-firewall
{
echo
"TODO: setup logging"
echo
"TODO: setup logging"
}
}
...
...
hack/ginkgo-e2e.sh
View file @
d64f0f11
...
@@ -103,10 +103,16 @@ else
...
@@ -103,10 +103,16 @@ else
auth_config
=()
auth_config
=()
fi
fi
if
[[
"
$KUBERNETES_PROVIDER
"
==
"libvirt-coreos"
]]
;
then
host
=
"http://
${
KUBE_MASTER_IP
-
}
:8080"
else
host
=
"https://
${
KUBE_MASTER_IP
-
}
"
fi
# Use the kubectl binary from the same directory as the e2e binary.
# Use the kubectl binary from the same directory as the e2e binary.
export
PATH
=
$(
dirname
"
${
e2e
}
"
)
:
"
${
PATH
}
"
export
PATH
=
$(
dirname
"
${
e2e
}
"
)
:
"
${
PATH
}
"
"
${
e2e
}
"
"
${
auth_config
[@]
:+
${
auth_config
[@]
}}
"
\
"
${
e2e
}
"
"
${
auth_config
[@]
:+
${
auth_config
[@]
}}
"
\
--host
=
"
https://
${
KUBE_MASTER_IP
-
}
"
\
--host
=
"
$host
"
\
--provider
=
"
${
KUBERNETES_PROVIDER
}
"
\
--provider
=
"
${
KUBERNETES_PROVIDER
}
"
\
--gce_project
=
"
${
PROJECT
:-}
"
\
--gce_project
=
"
${
PROJECT
:-}
"
\
--gce_zone
=
"
${
ZONE
:-}
"
\
--gce_zone
=
"
${
ZONE
:-}
"
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment