Merge pull request #322 from haircommander/go-1.17

ci: bump to go 1.17
containers · Jan 21, 2022 · 1688da5 · 1688da5
2 parents e2215a1 + e827355
commit 1688da5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git 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:
@@ -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
 
@@ -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:
@@ -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 \
@@ -101,7 +102,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:
@@ -117,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
diff --git 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"
@@ -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