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

Merge pull request #1130 from cevich/fix_clone_k8s_two

Browse source 
Fix Local modifications exist in repository
This commit is contained in:
Antonio Murdaca 2017-11-09 14:50:18 +01:00 committed by GitHub
commit 9d3c442b7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -94,7 +94,7 @@ ifneq ($(GOPATH),)
rm -f "$(GOPATH)/.gopathok" rm -f "$(GOPATH)/.gopathok"
endif endif
rm -rf _output rm -rf _output
rm -f docs/*.1 docs/*.5 docs/*.8 rm -f docs/*.5 docs/*.8
rm -fr test/testdata/redis-image rm -fr test/testdata/redis-image
find . -name \*~ -delete find . -name \*~ -delete
find . -name \#\* -delete find . -name \#\* -delete
@ -126,9 +126,6 @@ test-binaries: test/bin2img/bin2img test/copyimg/copyimg test/checkseccomp/check
MANPAGES_MD := $(wildcard docs/*.md) MANPAGES_MD := $(wildcard docs/*.md)
MANPAGES := $(MANPAGES_MD:%.md=%) MANPAGES := $(MANPAGES_MD:%.md=%)
docs/%.1: docs/%.1.md .gopathok
(go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@) || ($(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@)
docs/%.5: docs/%.5.md .gopathok docs/%.5: docs/%.5.md .gopathok
(go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@) || ($(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@) (go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@) || ($(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@)
@ -146,10 +143,8 @@ install.bin:
install ${SELINUXOPT} -D -m 755 bin/pause $(LIBEXECDIR)/crio/pause install ${SELINUXOPT} -D -m 755 bin/pause $(LIBEXECDIR)/crio/pause
install.man: install.man:
install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1
install ${SELINUXOPT} -d -m 755 $(MANDIR)/man5 install ${SELINUXOPT} -d -m 755 $(MANDIR)/man5
install ${SELINUXOPT} -d -m 755 $(MANDIR)/man8 install ${SELINUXOPT} -d -m 755 $(MANDIR)/man8
install ${SELINUXOPT} -m 644 $(filter %.1,$(MANPAGES)) -t $(MANDIR)/man1
install ${SELINUXOPT} -m 644 $(filter %.5,$(MANPAGES)) -t $(MANDIR)/man5 install ${SELINUXOPT} -m 644 $(filter %.5,$(MANPAGES)) -t $(MANDIR)/man5
install ${SELINUXOPT} -m 644 $(filter %.8,$(MANPAGES)) -t $(MANDIR)/man8 install ${SELINUXOPT} -m 644 $(filter %.8,$(MANPAGES)) -t $(MANDIR)/man8

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

@ -5,6 +5,7 @@
repo: "https://github.com/runcom/kubernetes.git" repo: "https://github.com/runcom/kubernetes.git"
dest: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes" dest: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes"
version: "cri-o-patched-1.8" version: "cri-o-patched-1.8"
force: "{{ force_clone | default(False) | bool}}"
- name: install etcd - name: install etcd
command: "hack/install-etcd.sh" command: "hack/install-etcd.sh"

3
contrib/test/integration/e2e.yml
View file

@ -1,8 +1,5 @@
--- ---
- name: clone build and install kubernetes
include: "build/kubernetes.yml"
- name: enable and start CRI-O - name: enable and start CRI-O
systemd: systemd:
name: crio name: crio

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

@ -54,5 +54,10 @@
tags: tags:
- e2e - e2e
tasks: tasks:
- name: clone build and install kubernetes
include: "build/kubernetes.yml"
vars:
force_clone: True
- name: run k8s e2e tests - name: run k8s e2e tests
include: e2e.yml include: e2e.yml