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
75b08423
Commit
75b08423
authored
Apr 21, 2016
by
nikhiljindal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removing KUBE_API_VERSIONS from our test scripts
parent
5555f6e1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
9 deletions
+6
-9
test-cmd.sh
hack/test-cmd.sh
+2
-2
test-go.sh
hack/test-go.sh
+2
-4
test-integration.sh
hack/test-integration.sh
+2
-3
No files found.
hack/test-cmd.sh
View file @
75b08423
...
...
@@ -183,7 +183,7 @@ kube::log::status "Starting kube-apiserver"
# Admission Controllers to invoke prior to persisting objects in cluster
ADMISSION_CONTROL
=
"NamespaceLifecycle,LimitRanger,ResourceQuota"
KUBE_API_VERSIONS
=
"v1,autoscaling/v1,batch/v1,apps/v1alpha1,extensions/v1beta1"
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
--address
=
"127.0.0.1"
\
--public-address-override
=
"127.0.0.1"
\
--port
=
"
${
API_PORT
}
"
\
...
...
@@ -1792,6 +1792,6 @@ __EOF__
kube::test::clear_all
}
KUBE_API_VERSIONS
=
"v1,autoscaling/v1,batch/v1,apps/v1alpha1,extensions/v1beta1"
runTests
"v1"
runTests
"v1"
kube::log::status
"TEST PASSED"
hack/test-go.sh
View file @
75b08423
...
...
@@ -323,10 +323,8 @@ for (( i=0, j=0; ; )); do
apiVersion=${apiVersions[i]}
etcdPrefix=${etcdPrefixes[j]}
echo "Running tests for APIVersion: $apiVersion with etcdPrefix: $etcdPrefix"
# KUBE_TEST_API sets the version of each group to be tested. KUBE_API_VERSIONS
# register the groups/versions as supported by k8s. So KUBE_API_VERSIONS
# needs to be the superset of KUBE_TEST_API.
KUBE_TEST_API="${apiVersion}" KUBE_API_VERSIONS="v1,autoscaling/v1,batch/v1,extensions/v1beta1,componentconfig/v1alpha1,metrics/v1alpha1,apps/v1alpha1,authorization.k8s.io/v1beta1" ETCD_PREFIX=${etcdPrefix} runTests "$@"
# KUBE_TEST_API sets the version of each group to be tested.
KUBE_TEST_API="${apiVersion}" ETCD_PREFIX=${etcdPrefix} runTests "$@"
i=${i}+1
j=${j}+1
if [[ i -eq ${apiVersionsCount} ]] && [[ j -eq ${etcdPrefixesCount} ]]; then
...
...
hack/test-integration.sh
View file @
75b08423
...
...
@@ -52,11 +52,10 @@ runTests() {
KUBE_RACE
=
""
\
KUBE_TIMEOUT
=
"
${
KUBE_TIMEOUT
}
"
\
KUBE_TEST_API_VERSIONS
=
"
$1
"
\
KUBE_API_VERSIONS
=
"v1,autoscaling/v1,batch/v1,apps/v1alpha1,extensions/v1beta1"
\
"
${
KUBE_ROOT
}
/hack/test-go.sh"
test
/integration
kube::log::status
"Running integration test scenario with watch cache on"
KUBE_
API_VERSIONS
=
"v1,autoscaling/v1,batch/v1,apps/v1alpha1,extensions/v1beta1"
KUBE_
TEST_API_VERSIONS
=
"
$1
"
"
${
KUBE_OUTPUT_HOSTBIN
}
/integration"
--v
=
${
LOG_LEVEL
}
\
KUBE_TEST_API_VERSIONS
=
"
$1
"
"
${
KUBE_OUTPUT_HOSTBIN
}
/integration"
--v
=
${
LOG_LEVEL
}
\
--max-concurrency
=
"
${
KUBE_INTEGRATION_TEST_MAX_CONCURRENCY
}
"
--watch-cache
=
true
cleanup
...
...
@@ -73,7 +72,7 @@ checkEtcdOnPath() {
checkEtcdOnPath
KUBE_API_VERSIONS
=
"v1,autoscaling/v1,batch/v1,apps/v1alpha1,extensions/v1beta1"
"
${
KUBE_ROOT
}
/hack/build-go.sh"
"
$@
"
cmd/integration
"
${
KUBE_ROOT
}
/hack/build-go.sh"
"
$@
"
cmd/integration
# Run cleanup to stop etcd on interrupt or other kill signal.
trap
cleanup EXIT
...
...
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