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

Merge pull request #640 from mrunalp/test_with_cgroupfs

Browse source 
test: Use cgroupfs for tests
This commit is contained in:
Antonio Murdaca 2017-07-06 16:06:42 +02:00 committed by GitHub
commit ea7045dfa8
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contrib/test/crio-integration-playbook.yaml
View file

@ -215,7 +215,7 @@
args: args:
chdir: /root/src/github.com/kubernetes-incubator/cri-o/ chdir: /root/src/github.com/kubernetes-incubator/cri-o/
- name: run integration tests RHEL - name: run integration tests RHEL
shell: 'CGROUP_MANAGER=systemd STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration 2>&1 > testout.txt' shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration 2>&1 > testout.txt'
args: args:
chdir: /root/src/github.com/kubernetes-incubator/cri-o chdir: /root/src/github.com/kubernetes-incubator/cri-o
async: 3600 async: 3600
@ -223,7 +223,7 @@
ignore_errors: yes ignore_errors: yes
when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS' when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
- name: run integration tests RHEL with xunit results - name: run integration tests RHEL with xunit results
shell: 'CGROUP_MANAGER=systemd STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration' shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration'
args: args:
chdir: /root/src/github.com/kubernetes-incubator/cri-o chdir: /root/src/github.com/kubernetes-incubator/cri-o
async: 3600 async: 3600
@ -231,7 +231,7 @@
ignore_errors: yes ignore_errors: yes
when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and xunit when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and xunit
- name: run integration tests Fedora - name: run integration tests Fedora
shell: 'CGROUP_MANAGER=systemd STORAGE_OPTS="--storage-driver=overlay2" make localintegration 2>&1 > testout.txt' shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2" make localintegration 2>&1 > testout.txt'
args: args:
chdir: /root/src/github.com/kubernetes-incubator/cri-o chdir: /root/src/github.com/kubernetes-incubator/cri-o
async: 3600 async: 3600
@ -239,7 +239,7 @@
ignore_errors: yes ignore_errors: yes
when: ansible_distribution == 'Fedora' when: ansible_distribution == 'Fedora'
- name: run integration tests Fedora with xunit results - name: run integration tests Fedora with xunit results
shell: 'CGROUP_MANAGER=systemd STORAGE_OPTS="--storage-driver=overlay2" make localintegration' shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2" make localintegration'
args: args:
chdir: /root/src/github.com/kubernetes-incubator/cri-o chdir: /root/src/github.com/kubernetes-incubator/cri-o
async: 3600 async: 3600
@ -280,12 +280,6 @@
poll: 10 poll: 10
- name: link runc - name: link runc
file: src=/usr/local/sbin/runc dest=/usr/bin/runc state=link file: src=/usr/local/sbin/runc dest=/usr/bin/runc state=link
- name: run CRI-O with systemd cgroup manager
replace:
regexp: 'cgroupfs'
replace: 'systemd'
name: /etc/crio/crio.conf
backup: yes
- name: run with overlay2 - name: run with overlay2
replace: replace:
regexp: 'storage_driver = ""' regexp: 'storage_driver = ""'

2
test/ctr.bats
View file

@ -709,7 +709,7 @@ function teardown() {
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod_id="$output" pod_id="$output"
oomconfig=$(cat "$TESTDATA"/container_config.json | python -c 'import json,sys;obj=json.load(sys.stdin);obj["image"]["image"] = "mrunalp/oom"; obj["linux"]["resources"]["memory_limit_in_bytes"] = 512000; obj["command"] = ["/oom"]; json.dump(obj, sys.stdout)') oomconfig=$(cat "$TESTDATA"/container_config.json | python -c 'import json,sys;obj=json.load(sys.stdin);obj["image"]["image"] = "mrunalp/oom"; obj["linux"]["resources"]["memory_limit_in_bytes"] = 5120000; obj["command"] = ["/oom"]; json.dump(obj, sys.stdout)')
echo "$oomconfig" > "$TESTDIR"/container_config_oom.json echo "$oomconfig" > "$TESTDIR"/container_config_oom.json
run crioctl ctr create --config "$TESTDIR"/container_config_oom.json --pod "$pod_id" run crioctl ctr create --config "$TESTDIR"/container_config_oom.json --pod "$pod_id"
echo "$output" echo "$output"