Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: also disable integration tests for untrusted GHA cmake workflows #14573

Merged
merged 1 commit into from
Jul 25, 2024
Merged

ci: also disable integration tests for untrusted GHA cmake workflows #14573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/macos-cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ on:
required: true
description: "read or readwrite"
type: string
execute-integration-tests:
required: true
description: "Integration tests require credentials."
type: boolean

permissions:
contents: read
Expand Down Expand Up @@ -138,6 +142,7 @@ jobs:
- name: Build google-cloud-cpp
run: |
export VCPKG_ROOT="${{ runner.temp }}/vcpkg"
export EXECUTE_INTEGRATION_TESTS=${{ inputs.execute-integration-tests }}
/opt/homebrew/bin/bash ci/gha/builds/macos-cmake.sh ${{ steps.dynamic.outputs.features }}
env:
SCCACHE_GCS_BUCKET: cloud-cpp-community-gha-cache
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-runner-untrusted.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ jobs:
}}
sccache-mode: 'DISABLED'
vcpkg-cache-mode: 'read'
execute-integration-tests: false
windows-cmake:
name: Windows-CMake
needs: [pre-flight]
Expand All @@ -112,3 +113,4 @@ jobs:
}}
sccache-mode: 'DISABLED'
vcpkg-cache-mode: 'read'
execute-integration-tests: false
2 changes: 2 additions & 0 deletions .github/workflows/test-runner.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ jobs:
}}
sccache-mode: 'READ_WRITE'
vcpkg-cache-mode: 'readwrite'
execute-integration-tests: true
secrets: inherit
windows-cmake:
name: Windows-CMake
Expand All @@ -153,6 +154,7 @@ jobs:
}}
sccache-mode: 'READ_WRITE'
vcpkg-cache-mode: 'readwrite'
execute-integration-tests: true
secrets: inherit
notify:
name: Notify-Google-Chat
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/windows-cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ on:
required: true
description: "read or readwrite"
type: string
execute-integration-tests:
required: true
description: "Integration tests require credentials."
type: boolean

permissions:
contents: read
Expand Down Expand Up @@ -267,6 +271,7 @@ jobs:
# Put the CMake output in a directory with more space and keep it short
# to avoid running into the MSVC limits.
export CMAKE_OUT='c:\b'
export EXECUTE_INTEGRATION_TESTS=${{ inputs.execute-integration-tests }}
ci/gha/builds/windows-cmake.sh ${{ matrix.build_type }} ${{ steps.dynamic.outputs.features }}
env:
SCCACHE_GCS_BUCKET: cloud-cpp-community-gha-cache
Expand Down
16 changes: 9 additions & 7 deletions ci/gha/builds/macos-cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@ time {
io::run ctest "${ctest_args[@]}" --test-dir cmake-out -LE integration-test
}

TIMEFORMAT="==> 🕑 Storage integration tests done in %R seconds"
if [[ -n "${GHA_TEST_BUCKET:-}" ]]; then
time {
export GOOGLE_CLOUD_CPP_STORAGE_TEST_BUCKET_NAME="${GHA_TEST_BUCKET}"
io::run ctest "${ctest_args[@]}" --repeat until-pass:3 \
--test-dir cmake-out -L integration-test-gha
}
if [[ "${EXECUTE_INTEGRATION_TESTS}" == "true" ]]; then
TIMEFORMAT="==> 🕑 Storage integration tests done in %R seconds"
if [[ -n "${GHA_TEST_BUCKET:-}" ]]; then
time {
export GOOGLE_CLOUD_CPP_STORAGE_TEST_BUCKET_NAME="${GHA_TEST_BUCKET}"
io::run ctest "${ctest_args[@]}" --repeat until-pass:3 \
--test-dir cmake-out -L integration-test-gha
}
fi
fi
22 changes: 12 additions & 10 deletions ci/gha/builds/windows-cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,17 @@ time {
io::run ctest "${ctest_args[@]}" --test-dir "${CMAKE_OUT}" -LE integration-test
}

TIMEFORMAT="==> 🕑 Storage integration tests done in %R seconds"
if [[ -n "${GHA_TEST_BUCKET:-}" ]]; then
time {
# gRPC requires a local roots.pem on Windows
# https://github.com/grpc/grpc/issues/16571
curl -fsSL -o "${HOME}/roots.pem" https://pki.google.com/roots.pem
export GRPC_DEFAULT_SSL_ROOTS_FILE_PATH="${HOME}/roots.pem"
if [[ "${EXECUTE_INTEGRATION_TESTS}" == "true" ]]; then
TIMEFORMAT="==> 🕑 Storage integration tests done in %R seconds"
if [[ -n "${GHA_TEST_BUCKET:-}" ]]; then
time {
# gRPC requires a local roots.pem on Windows
# https://github.com/grpc/grpc/issues/16571
curl -fsSL -o "${HOME}/roots.pem" https://pki.google.com/roots.pem
export GRPC_DEFAULT_SSL_ROOTS_FILE_PATH="${HOME}/roots.pem"

export GOOGLE_CLOUD_CPP_STORAGE_TEST_BUCKET_NAME="${GHA_TEST_BUCKET}"
io::run ctest "${ctest_args[@]}" --test-dir "${CMAKE_OUT}" -L integration-test-gha
}
export GOOGLE_CLOUD_CPP_STORAGE_TEST_BUCKET_NAME="${GHA_TEST_BUCKET}"
io::run ctest "${ctest_args[@]}" --test-dir "${CMAKE_OUT}" -L integration-test-gha
}
fi
fi
Loading