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
39965b67
Commit
39965b67
authored
Oct 29, 2015
by
Jeff Lowdermilk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move branch-specific test env out of the kubekins-test image
parent
887b9dd7
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
gotest-dockerized.sh
hack/jenkins/gotest-dockerized.sh
+1
-1
test-dockerized.sh
hack/jenkins/test-dockerized.sh
+3
-1
Dockerfile
hack/jenkins/test-image/Dockerfile
+0
-2
Makefile
hack/jenkins/test-image/Makefile
+1
-1
No files found.
hack/jenkins/gotest-dockerized.sh
View file @
39965b67
...
@@ -42,5 +42,5 @@ docker run --rm=true \
...
@@ -42,5 +42,5 @@ docker run --rm=true \
-v
"
${
REPO_DIR
}
"
:/go/src/k8s.io/kubernetes
\
-v
"
${
REPO_DIR
}
"
:/go/src/k8s.io/kubernetes
\
-v
"
${
KUBE_JUNIT_REPORT_DIR
}
"
:/workspace/artifacts
\
-v
"
${
KUBE_JUNIT_REPORT_DIR
}
"
:/workspace/artifacts
\
--env
REPO_DIR
=
"
${
REPO_DIR
}
"
\
--env
REPO_DIR
=
"
${
REPO_DIR
}
"
\
-i
gcr.io/google_containers/kubekins-test:0.
1
\
-i
gcr.io/google_containers/kubekins-test:0.
2
\
bash
-c
"cd kubernetes && ./hack/jenkins/test-dockerized.sh"
bash
-c
"cd kubernetes && ./hack/jenkins/test-dockerized.sh"
hack/jenkins/test-dockerized.sh
View file @
39965b67
...
@@ -40,12 +40,14 @@ export KUBE_KEEP_VERBOSE_TEST_OUTPUT=y
...
@@ -40,12 +40,14 @@ export KUBE_KEEP_VERBOSE_TEST_OUTPUT=y
export
KUBE_TIMEOUT
=
'-timeout 300s'
export
KUBE_TIMEOUT
=
'-timeout 300s'
export
KUBE_INTEGRATION_TEST_MAX_CONCURRENCY
=
4
export
KUBE_INTEGRATION_TEST_MAX_CONCURRENCY
=
4
export
LOG_LEVEL
=
4
export
LOG_LEVEL
=
4
export
KUBE_TEST_API_VERSIONS
=
v1,extensions/v1beta1
export
KUBE_TEST_ETCD_PREFIXES
=
registry
./hack/build-go.sh
./hack/build-go.sh
godep go
install
./...
godep go
install
./...
./hack/install-etcd.sh
./hack/install-etcd.sh
./hack/verify-all.sh
./hack/verify-all.sh
-v
./hack/test-go.sh
--
-p
=
2
./hack/test-go.sh
--
-p
=
2
./hack/test-cmd.sh
./hack/test-cmd.sh
...
...
hack/jenkins/test-image/Dockerfile
View file @
39965b67
...
@@ -18,8 +18,6 @@
...
@@ -18,8 +18,6 @@
FROM
golang:1.4
FROM
golang:1.4
MAINTAINER
Jeff Lowdermilk <jeffml@google.com>
MAINTAINER
Jeff Lowdermilk <jeffml@google.com>
ENV
KUBE_TEST_API_VERSIONS v1,extensions/v1beta1
ENV
KUBE_TEST_ETCD_PREFIXES registry
ENV
WORKSPACE /workspace
ENV
WORKSPACE /workspace
ENV
TERM xterm
ENV
TERM xterm
...
...
hack/jenkins/test-image/Makefile
View file @
39965b67
all
:
push
all
:
push
TAG
=
0.
1
TAG
=
0.
2
container
:
container
:
docker build
-t
gcr.io/google_containers/kubekins-test .
docker build
-t
gcr.io/google_containers/kubekins-test .
...
...
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