Skip to content

Commit 4a8bd02

Browse files
committed
add fixture presubmit for storage
1 parent 6cd141e commit 4a8bd02

File tree

4 files changed

+44
-8
lines changed

4 files changed

+44
-8
lines changed

.github/workflows/ci-presubmit.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,24 @@ jobs:
437437
name: artifacts-tests-e2e-fixtures-sql
438438
path: /tmp/artifacts/
439439

440+
tests-e2e-fixtures-storage:
441+
runs-on: ubuntu-latest
442+
timeout-minutes: 240
443+
steps:
444+
- uses: actions/checkout@v4
445+
- uses: actions/setup-go@v5
446+
with:
447+
go-version-file: 'go.mod'
448+
- name: "Run dev/ci/presubmits/tests-e2e-fixtures-storage"
449+
run: |
450+
./dev/ci/presubmits/tests-e2e-fixtures-storage
451+
env:
452+
ARTIFACTS: /tmp/artifacts
453+
- name: "Upload artifacts"
454+
uses: actions/upload-artifact@v4
455+
with:
456+
name: artifacts-tests-e2e-fixtures-storage
457+
path: /tmp/artifacts/
440458

441459
tests-e2e-fixtures-vertexai:
442460
runs-on: ubuntu-latest

dev/ci/presubmits/tests-e2e-fixtures

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ SKIP_TEST_APIGROUPS=(
3939
"secretmanager.cnrm.cloud.google.com"
4040
"spanner.cnrm.cloud.google.com"
4141
"sql.cnrm.cloud.google.com"
42+
"storage.cnrm.cloud.google.com"
4243
"vertexai.cnrm.cloud.google.com"
4344
"vmwareengine.cnrm.cloud.google.com"
4445
"workstations.cnrm.cloud.google.com"
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/bash
2+
# Copyright 2025 Google LLC
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
set -o errexit
17+
set -o nounset
18+
set -o pipefail
19+
20+
REPO_ROOT="$(git rev-parse --show-toplevel)"
21+
cd ${REPO_ROOT}/
22+
23+
export ONLY_TEST_APIGROUPS="storage.cnrm.cloud.google.com"
24+
25+
${REPO_ROOT}/dev/tasks/run-e2e

tests/e2e/unified_test.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -579,14 +579,6 @@ func isOperationDone(s string) bool {
579579

580580
// addTestTimeout will ensure the test fails if not completed before timeout
581581
func addTestTimeout(ctx context.Context, t *testing.T, timeout time.Duration, name string) context.Context {
582-
if name == "storageanywherecache" {
583-
// Special timeouts for anywherecache resource.
584-
if targetGCP := os.Getenv("E2E_GCP_TARGET"); targetGCP == "mock" {
585-
timeout = 3 * time.Minute
586-
} else {
587-
timeout = 4 * time.Hour
588-
}
589-
}
590582
ctx, cancel := context.WithTimeout(ctx, timeout)
591583

592584
done := false

0 commit comments

Comments
 (0)