vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

contrib: parametrize the crio socket for kube

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-11-22 14:14:06 +01:00
parent 73c1a9823f
commit 2f344c7533
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/test/integration/build/kubernetes.yml
View file

@ -40,7 +40,7 @@
export PATH=/usr/local/go/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/root/bin:{{ ansible_env.GOPATH }}/bin:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/third_party/etcd:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/_output/local/bin/linux/amd64/ export PATH=/usr/local/go/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/root/bin:{{ ansible_env.GOPATH }}/bin:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/third_party/etcd:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/_output/local/bin/linux/amd64/
export CONTAINER_RUNTIME=remote export CONTAINER_RUNTIME=remote
export CGROUP_DRIVER=systemd export CGROUP_DRIVER=systemd
export CONTAINER_RUNTIME_ENDPOINT='/var/run/crio/crio.sock --runtime-request-timeout=5m' export CONTAINER_RUNTIME_ENDPOINT='{{ crio_socket }} --runtime-request-timeout=5m'
export ALLOW_SECURITY_CONTEXT="," export ALLOW_SECURITY_CONTEXT=","
export ALLOW_PRIVILEGED=1 export ALLOW_PRIVILEGED=1
export DNS_SERVER_IP={{ ansible_eth0.ipv4.address }} export DNS_SERVER_IP={{ ansible_eth0.ipv4.address }}

2
contrib/test/integration/main.yml
View file

@ -25,6 +25,7 @@
include: "build/kubernetes.yml" include: "build/kubernetes.yml"
vars: vars:
k8s_git_version: "cri-o-node-e2e-patched-logs" k8s_git_version: "cri-o-node-e2e-patched-logs"
crio_socket: "/var/run/crio.sock"
- name: clone build and install runc - name: clone build and install runc
include: "build/runc.yml" include: "build/runc.yml"
@ -81,5 +82,6 @@
vars: vars:
force_clone: True force_clone: True
k8s_git_version: "cri-o-patched-1.9" k8s_git_version: "cri-o-patched-1.9"
crio_socket: "/var/run/crio/crio.sock"
- name: run k8s e2e tests - name: run k8s e2e tests
include: e2e.yml include: e2e.yml