From 2f067c52dade09a8bd28594877a26350c5066523 Mon Sep 17 00:00:00 2001 From: Arjun Raja Yogidas Date: Thu, 16 May 2024 20:09:15 +0000 Subject: [PATCH 1/2] test with standard 7.0 Signed-off-by: Arjun Raja Yogidas --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 724f3813e..c7a0e9402 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ env: jobs: test: - runs-on: ubuntu-20.04 + runs-on: codebuild-soci-github-ci-pipeline-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge timeout-minutes: 15 steps: - uses: actions/checkout@v4 @@ -34,7 +34,7 @@ jobs: - run: make - run: make test integration: - runs-on: ubuntu-20.04 + runs-on: codebuild-soci-github-ci-pipeline-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge timeout-minutes: 40 strategy: fail-fast: false @@ -47,4 +47,5 @@ jobs: - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} + - run: goenv global 1.22.1 - run: make integration From 024ebced24c77a05c4449004484447d10d5f9032 Mon Sep 17 00:00:00 2001 From: Arjun Raja Yogidas Date: Fri, 17 May 2024 21:52:47 +0000 Subject: [PATCH 2/2] Update to 1.7.4 from upstream - fix mount bug Signed-off-by: Arjun Raja Yogidas --- integration/pull_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/pull_test.go b/integration/pull_test.go index 0bfe1d372..d9929c470 100644 --- a/integration/pull_test.go +++ b/integration/pull_test.go @@ -236,7 +236,7 @@ func TestLazyPullWithSparseIndex(t *testing.T) { } func checkFuseMounts(t *testing.T, sh *shell.Shell, remoteSnapshotsExpectedCount int) { - mounts := string(sh.O("mount")) + mounts := string(sh.O("cat", "/proc/mounts")) remoteSnapshotsActualCount := strings.Count(mounts, "fuse.rawBridge") if remoteSnapshotsExpectedCount != remoteSnapshotsActualCount { t.Fatalf("incorrect number of remote snapshots; expected=%d, actual=%d",