From d6bdb9730cdacae66dbebdcae0ed11fe72178361 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 20 Jan 2022 15:51:35 -0500 Subject: [PATCH 1/5] ci: bump to go 1.17 Signed-off-by: Peter Hunt --- .github/workflows/integration.yml | 10 +++++----- hack/kubernetes-e2e | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index e9736541..1218b3f4 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' - uses: actions/checkout@v2 - uses: actions/cache@v2 with: @@ -29,7 +29,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' - uses: actions/checkout@v2 - uses: actions/cache@v2 with: @@ -50,7 +50,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' - uses: actions/checkout@v2 - uses: actions/cache@v2 with: @@ -74,7 +74,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' - uses: actions/checkout@v2 - uses: actions/cache@v2 with: @@ -101,7 +101,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.17' - uses: actions/checkout@v2 - uses: actions/cache@v2 with: diff --git a/hack/kubernetes-e2e b/hack/kubernetes-e2e index 3c62d652..48b8db53 100755 --- a/hack/kubernetes-e2e +++ b/hack/kubernetes-e2e @@ -28,7 +28,7 @@ systemctl is-active --quiet crio && echo CRI-O is running journalctl --no-pager -u crio # Start Kubernetes -GOROOT="$GOROOT_1_16_X64" +GOROOT="$GOROOT_1_17_X64" GOPATH="$HOME/go" PATH="$GOROOT/bin:$PATH" K8SPATH="$GOPATH/src/k8s.io" From ca127949f291a2ddb340b0f2ffccf027ff87abfa Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 20 Jan 2022 16:13:02 -0500 Subject: [PATCH 2/5] ci: give conmon job sudo Signed-off-by: Peter Hunt --- .github/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 1218b3f4..05344182 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -41,7 +41,7 @@ jobs: - run: hack/github-actions-setup - name: Run conmon integration tests run: | - make vendor + sudo make vendor sudo mkdir -p /var/run/crio sudo make test-binary From b6025be9b93fffe2cb1bfc1a5e24851a1311342b Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 20 Jan 2022 16:13:13 -0500 Subject: [PATCH 3/5] ci: set host IP Signed-off-by: Peter Hunt --- hack/kubernetes-e2e | 1 + 1 file changed, 1 insertion(+) diff --git a/hack/kubernetes-e2e b/hack/kubernetes-e2e index 48b8db53..0d9cef4d 100755 --- a/hack/kubernetes-e2e +++ b/hack/kubernetes-e2e @@ -89,6 +89,7 @@ export PATH="$GOPATH/src/k8s.io/kubernetes/_output/local/bin/linux/amd64:$PATH" export KUBE_MASTER_URL=$IP export KUBE_MASTER_IP=$IP export KUBE_MASTER=$IP +export HOSTNAME_OVERRIDE=$IP export GINKGO_PARALLEL_NODES=4 export GINKGO_PARALLEL=y From ad092b1ad643900977abe3b398d1cdaca8794826 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 20 Jan 2022 16:13:51 -0500 Subject: [PATCH 4/5] ci: run vendor on podman job Signed-off-by: Peter Hunt --- .github/workflows/integration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 05344182..10294a4a 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -90,7 +90,8 @@ jobs: export PATH=${GOROOT}/bin:$PATH git clone https://github.com/containers/podman cd podman - make bin/podman + make vendor + make sudo -E ginkgo \ -skip 'run.apparmor.disabled|image.trust.show.--json|run.network.bind.to.HostIP' \ -noColor \ From e827355e2170cd369ee51f7ae5a8c3d97a4d7615 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 20 Jan 2022 16:53:40 -0500 Subject: [PATCH 5/5] ci: install all binaries for podman-system Signed-off-by: Peter Hunt --- .github/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 10294a4a..b37b12a5 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -118,5 +118,5 @@ jobs: export PATH=${GOROOT}/bin:$PATH git clone https://github.com/containers/podman cd podman - make bin/podman + make && sudo make install sudo -E make localsystem