From f4883dd27a51f44d5df069561bf0aeb2837c1704 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Wed, 8 Nov 2017 16:10:58 +0100 Subject: [PATCH 1/2] Makefile: do not install man1 files kpod removal actually removed all man1 docs but the Makefile was still referencing man1 stuff. CRI-O doesn't have man1 so let's drop that altogether now. Signed-off-by: Antonio Murdaca --- Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f28e0e5f..5c669831 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,7 @@ ifneq ($(GOPATH),) rm -f "$(GOPATH)/.gopathok" endif rm -rf _output - rm -f docs/*.1 docs/*.5 docs/*.8 + rm -f docs/*.5 docs/*.8 rm -fr test/testdata/redis-image 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 := $(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 (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.man: - install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1 install ${SELINUXOPT} -d -m 755 $(MANDIR)/man5 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 %.8,$(MANPAGES)) -t $(MANDIR)/man8 From d49fb788da507ade493a22b19ed491dfe29e1910 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 8 Nov 2017 11:24:57 -0500 Subject: [PATCH 2/2] Fix Local modifications exist in repository Depending on the state of upstream repositories, it's possible the kubernetes repo could change between the ``setup`` and ``run`` phase. Alternatively, something during ``setup`` itself could mangle the repo. Add an option to force clone the kubernetes repo. This gives support for testing on multiple CRI-O branches, realizing some benefit from caching, yet also allows hauling in brand-new-kubernetes for the e2e tests. Signed-off-by: Chris Evich --- contrib/test/integration/build/kubernetes.yml | 1 + contrib/test/integration/e2e.yml | 3 --- contrib/test/integration/main.yml | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/test/integration/build/kubernetes.yml b/contrib/test/integration/build/kubernetes.yml index f724230c..f0b929a7 100644 --- a/contrib/test/integration/build/kubernetes.yml +++ b/contrib/test/integration/build/kubernetes.yml @@ -5,6 +5,7 @@ repo: "https://github.com/runcom/kubernetes.git" dest: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes" version: "cri-o-patched-1.8" + force: "{{ force_clone | default(False) | bool}}" - name: install etcd command: "hack/install-etcd.sh" diff --git a/contrib/test/integration/e2e.yml b/contrib/test/integration/e2e.yml index 41f92757..5c4d656e 100644 --- a/contrib/test/integration/e2e.yml +++ b/contrib/test/integration/e2e.yml @@ -1,8 +1,5 @@ --- -- name: clone build and install kubernetes - include: "build/kubernetes.yml" - - name: enable and start CRI-O systemd: name: crio diff --git a/contrib/test/integration/main.yml b/contrib/test/integration/main.yml index ce4a206f..19dd5b3e 100644 --- a/contrib/test/integration/main.yml +++ b/contrib/test/integration/main.yml @@ -54,5 +54,10 @@ tags: - e2e tasks: + - name: clone build and install kubernetes + include: "build/kubernetes.yml" + vars: + force_clone: True + - name: run k8s e2e tests include: e2e.yml