Merge pull request #323 from haircommander/fix-ci-4

fix CI
containers · Jan 24, 2022 · 4ac7167 · 4ac7167
2 parents 1688da5 + f20bbbe
commit 4ac7167
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -84,13 +84,14 @@ jobs:
           key: go-integration-podman-${{ hashFiles('**/go.mod') }}
           restore-keys: go-integration-podman-
       - run: hack/github-actions-setup
+      - run: |
+          # https://github.com/actions/setup-go/issues/107
+          cp -f `which go` /usr/bin/go
+
       - name: Run Podman integration tests
         run: |
-          # https://github.com/actions/setup-go/issues/107
-          export PATH=${GOROOT}/bin:$PATH
           git clone https://github.com/containers/podman
           cd podman
-          make vendor
           make
           sudo -E ginkgo \
             -skip 'run.apparmor.disabled|image.trust.show.--json|run.network.bind.to.HostIP' \
@@ -109,14 +110,15 @@ jobs:
           path: |
             ~/go/pkg/mod
             ~/.cache/go-build
-          key: go-integration-podman-${{ hashFiles('**/go.mod') }}
-          restore-keys: go-integration-podman-
+          key: go-integration-podman-system-${{ hashFiles('**/go.mod') }}
+          restore-keys: go-integration-podman-system-
       - run: hack/github-actions-setup
       - name: Run Podman system tests
         run: |
           # https://github.com/actions/setup-go/issues/107
           export PATH=${GOROOT}/bin:$PATH
           git clone https://github.com/containers/podman
           cd podman
-          make && sudo make install
+          make bin/podman bin/rootlessport
+          sudo mkdir -p /usr/local/libexec/podman && sudo cp bin/rootlessport /usr/local/libexec/podman
           sudo -E make localsystem
diff --git a/hack/github-actions-setup b/hack/github-actions-setup
@@ -18,6 +18,7 @@ main() {
     install_runc
     install_cni_plugins
     install_testdeps
+	setup_etc_subid
 }
 
 prepare_system() {
@@ -132,4 +133,10 @@ install_testdeps() {
     popd
 }
 
+setup_etc_subid() {
+	echo "containers:200000:65536" | sudo tee -a /etc/subuid
+	echo "containers:200000:65536" | sudo tee -a /etc/subgid
+
+}
+
 main "$@"