Backport of Use backport-compatible assertion into release/1.14.x (#15549)

This pull request was automerged via backport-assistant

.circleci/config.yml

@@ -491,7 +491,10 @@ jobs:
       GOOS: linux
     steps:
       - checkout
-      - run: sudo apt-get update --allow-releaseinfo-change-suite --allow-releaseinfo-change-version && sudo apt-get install -y gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu
+      - run: 
+          command: |
+            sudo rm -fv /etc/apt/sources.list.d/github_git-lfs.list # workaround for https://github.com/actions/runner-images/issues/1983
+            sudo apt-get update --allow-releaseinfo-change-suite --allow-releaseinfo-change-version && sudo apt-get install -y gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu
       - run:
           environment:
             GOARM: 5

agent/consul/client_test.go

@@ -964,6 +964,6 @@ func TestClient_RPC_Timeout(t *testing.T) {
 			},
 		}, &out)
 		require.Error(t, err)
-		require.ErrorContains(t, err, "rpc error making call: i/o deadline reached")
+		require.Contains(t, err.Error(), "rpc error making call: i/o deadline reached")
 	})
 }