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
8e168f8d
Commit
8e168f8d
authored
Aug 22, 2016
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use kubekins-test:v20160822 everywhere
parent
d6afd304
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Dockerfile
hack/jenkins/e2e-image/Dockerfile
+1
-1
Makefile
hack/jenkins/e2e-image/Makefile
+2
-2
gotest-dockerized.sh
hack/jenkins/gotest-dockerized.sh
+1
-1
No files found.
hack/jenkins/e2e-image/Dockerfile
View file @
8e168f8d
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
# This file creates a build environment for building and running kubernetes
# This file creates a build environment for building and running kubernetes
# unit and integration tests
# unit and integration tests
FROM
gcr.io/google-containers/kubekins-test:v201608
10
FROM
gcr.io/google-containers/kubekins-test:v201608
22
MAINTAINER
Erick Fejta <fejta@google.com>
MAINTAINER
Erick Fejta <fejta@google.com>
# Defaults of all e2e runs
# Defaults of all e2e runs
...
...
hack/jenkins/e2e-image/Makefile
View file @
8e168f8d
...
@@ -15,6 +15,8 @@
...
@@ -15,6 +15,8 @@
IMG
=
gcr.io/google-containers/kubekins-e2e
IMG
=
gcr.io/google-containers/kubekins-e2e
TAG
=
$(
shell
date
+v%Y%m%d
)
TAG
=
$(
shell
date
+v%Y%m%d
)
all
:
build
e2e
:
e2e
:
cp
../../e2e.go .
cp
../../e2e.go .
...
@@ -30,8 +32,6 @@ upload-to-gcs.sh:
...
@@ -30,8 +32,6 @@ upload-to-gcs.sh:
clean
:
clean
:
rm
-rf
e2e.go e2e-runner.sh sh2ju.sh upload-to-gcs.sh
rm
-rf
e2e.go e2e-runner.sh sh2ju.sh upload-to-gcs.sh
all
:
push
build
:
e2e e2e-runner sh2ju upload-to-gcs
build
:
e2e e2e-runner sh2ju upload-to-gcs
docker build
-t
$(IMG)
:
$(TAG)
.
docker build
-t
$(IMG)
:
$(TAG)
.
docker tag
-f
$(IMG)
:
$(TAG)
$(IMG)
:latest
docker tag
-f
$(IMG)
:
$(TAG)
$(IMG)
:latest
...
...
hack/jenkins/gotest-dockerized.sh
View file @
8e168f8d
...
@@ -45,5 +45,5 @@ docker run --rm=true \
...
@@ -45,5 +45,5 @@ docker run --rm=true \
-e
"KUBE_VERIFY_GIT_BRANCH=
${
KUBE_VERIFY_GIT_BRANCH
:-}
"
\
-e
"KUBE_VERIFY_GIT_BRANCH=
${
KUBE_VERIFY_GIT_BRANCH
:-}
"
\
-e
"REPO_DIR=
${
REPO_DIR
}
"
\
-e
"REPO_DIR=
${
REPO_DIR
}
"
\
-e
"HOST_ARTIFACTS_DIR=
${
HOST_ARTIFACTS_DIR
}
"
\
-e
"HOST_ARTIFACTS_DIR=
${
HOST_ARTIFACTS_DIR
}
"
\
-i
gcr.io/google_containers/kubekins-test:
go1.6.3-docker1.9.1-rev3
\
-i
gcr.io/google_containers/kubekins-test:
v20160822
\
bash
-c
"cd kubernetes &&
${
KUBE_TEST_SCRIPT
:-
./hack/jenkins/test-dockerized.sh
}
"
bash
-c
"cd kubernetes &&
${
KUBE_TEST_SCRIPT
:-
./hack/jenkins/test-dockerized.sh
}
"
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