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
7e51ee1c
Commit
7e51ee1c
authored
Aug 12, 2016
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Install bc in the kubekins-test image
It is needed by the shell2junit script.
parent
a81732ba
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
3 deletions
+5
-3
dockerized-e2e-runner.sh
hack/jenkins/dockerized-e2e-runner.sh
+1
-1
gotest-dockerized.sh
hack/jenkins/gotest-dockerized.sh
+1
-1
Dockerfile
hack/jenkins/test-image/Dockerfile
+2
-0
Makefile
hack/jenkins/test-image/Makefile
+1
-1
No files found.
hack/jenkins/dockerized-e2e-runner.sh
View file @
7e51ee1c
...
...
@@ -61,5 +61,5 @@ docker run --rm=true -i \
-e
"WORKSPACE=/workspace"
\
${
KUBEKINS_SERVICE_ACCOUNT_FILE
:+-e
"KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"
}
\
"
${
docker_extra_args
[@]
:+
${
docker_extra_args
[@]
}}
"
\
gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev
2
\
gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev
3
\
bash
-c
"bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"
hack/jenkins/gotest-dockerized.sh
View file @
7e51ee1c
...
...
@@ -45,5 +45,5 @@ docker run --rm=true \
-e
"KUBE_VERIFY_GIT_BRANCH=
${
KUBE_VERIFY_GIT_BRANCH
:-}
"
\
-e
"REPO_DIR=
${
REPO_DIR
}
"
\
-e
"HOST_ARTIFACTS_DIR=
${
HOST_ARTIFACTS_DIR
}
"
\
-i
gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev
2
\
-i
gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev
3
\
bash
-c
"cd kubernetes &&
${
KUBE_TEST_SCRIPT
:-
./hack/jenkins/test-dockerized.sh
}
"
hack/jenkins/test-image/Dockerfile
View file @
7e51ee1c
...
...
@@ -26,12 +26,14 @@ ENV DOCKER_VERSION 1.9.1
WORKDIR
/workspace
# bc is needed by shell2junit
# dnsutils is needed by federation cluster scripts.
# file is used when uploading test artifacts to GCS.
# jq is used by hack/verify-godep-licenses.sh
# python-pip is needed to install the AWS cli.
# netcat is used by integration test scripts.
RUN
apt-get
-o
Acquire::Check-Valid-Until
=
false
update
&&
apt-get
install
-y
\
bc
\
dnsutils
\
file
\
jq
\
...
...
hack/jenkins/test-image/Makefile
View file @
7e51ee1c
...
...
@@ -16,7 +16,7 @@ all: push
# Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION
# These versions are specified in the Dockerfile
TAG
=
go1.6.3-docker1.9.1-rev
2
TAG
=
go1.6.3-docker1.9.1-rev
3
container
:
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