Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump go version to build kubernetes #2955

Merged
merged 4 commits into from
Nov 7, 2019
Merged

bump go version to build kubernetes #2955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d6cac6
bump go version to build kubernetes
haircommander Nov 7, 2019
eebeefb
drop godoc
haircommander Nov 7, 2019
23680d6
Use updated cri-tools
haircommander Nov 7, 2019
8a45293
don't use go install to install cri-tools
haircommander Nov 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 9 additions & 14 deletions contrib/test/integration/build/cri-tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,15 @@
version: "{{ cri_tools_git_version }}"
force: "{{ force_clone | default(False) | bool}}"

- name: install crictl
command: "/usr/bin/go install github.com/kubernetes-sigs/cri-tools/cmd/crictl"
- name: build cri-tools
make:
chdir: "{{ ansible_env.GOPATH }}/src/github.com/kubernetes-sigs/cri-tools"

- name: install critest
command: "/usr/bin/go test -c github.com/kubernetes-sigs/cri-tools/cmd/critest -o {{ ansible_env.GOPATH }}/bin/critest"

- name: link crictl
file:
src: "{{ ansible_env.GOPATH }}/bin/crictl"
dest: /usr/bin/crictl
state: link

- name: link critest
- name: link crictl and critest
file:
src: "{{ ansible_env.GOPATH }}/bin/critest"
dest: /usr/bin/critest
src: "{{ ansible_env.GOPATH }}/src/github.com/kubernetes-sigs/cri-tools/_output/{{ item }}"
dest: "/usr/bin/{{ item }}"
state: link
with_items:
- "critest"
- "crictl"
1 change: 0 additions & 1 deletion contrib/test/integration/golang.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
state: link
with_items:
- go
- godoc
- gofmt

- name: ensure user profile exists
Expand Down
10 changes: 5 additions & 5 deletions contrib/test/integration/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
- name: install Golang tools
include: golang.yml
vars:
version: "1.12.6"
version: "1.13.4"

- name: clone build and install bats
include: "build/bats.yml"

- name: clone build and install cri-tools
include: "build/cri-tools.yml"
vars:
cri_tools_git_version: v1.16.1
cri_tools_git_version: f8a6b3dfbb7a54f696be9c6748cbcb830ee32021

- name: clone build and install kubernetes
include: "build/kubernetes.yml"
Expand Down Expand Up @@ -60,7 +60,7 @@
- name: install Golang tools
include: golang.yml
vars:
version: "1.12.9"
version: "1.13.4"
- name: clone build and install cri-o
include: "build/cri-o.yml"

Expand All @@ -84,7 +84,7 @@
include: "build/cri-tools.yml"
vars:
force_clone: true
cri_tools_git_version: v1.16.1
cri_tools_git_version: f8a6b3dfbb7a54f696be9c6748cbcb830ee32021
- name: run cri-o integration tests
include: test.yml

Expand All @@ -99,7 +99,7 @@
include: "build/cri-tools.yml"
vars:
force_clone: true
cri_tools_git_version: v1.16.1
cri_tools_git_version: f8a6b3dfbb7a54f696be9c6748cbcb830ee32021
- name: run critest validation and benchmarks
include: critest.yml

Expand Down