Skip to content

Commit 6ba1aa5

Browse files
authored
Merge pull request #272 from davidz627/fix/testFocus
Expand test focus of migration tests
2 parents 2f7def4 + 71085ca commit 6ba1aa5

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

test/run-k8s-integration-migration-local.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set -o nounset
44
set -o errexit
55

66
readonly PKGDIR=${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
7+
readonly GCE_PD_TEST_FOCUS="\s[V|v]olume\sexpand|\[sig-storage\]\sIn-tree\sVolumes\s\[Driver:\sgcepd\]\s\[Testpattern:\sDynamic\sPV|allowedTopologies|Pod\sDisks|PersistentVolumes\sDefault"
78
source "${PKGDIR}/deploy/common.sh"
89

910
ensure_var GCE_PD_CSI_STAGING_IMAGE
@@ -12,7 +13,7 @@ ensure_var GCE_PD_SA_DIR
1213
make -C ${PKGDIR} test-k8s-integration
1314
${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false \
1415
--staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
15-
--deploy-overlay-name=dev --test-focus="\[sig-storage\]\sIn-tree\sVolumes\s\[Driver:\sgcepd\].*" \
16+
--deploy-overlay-name=dev --test-focus=${GCE_PD_TEST_FOCUS} \
1617
--kube-feature-gates="CSIMigration=true,CSIMigrationGCE=true" --migration-test=true --gce-zone="us-central1-b"
1718

1819
# This version of the command does not build the driver or K8s, points to a
@@ -21,6 +22,6 @@ ${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false \
2122
# ensure_var GCE_PD_ZONE
2223
# ${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false \
2324
# --staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
24-
# --deploy-overlay-name=dev --test-focus="\[sig-storage\]\sIn-tree\sVolumes\s\[Driver:\sgcepd\].*" \
25+
# --deploy-overlay-name=dev --test-focus=${GCE_PD_TEST_FOCUS} \
2526
# --bringup-cluster=false --teardown-cluster=false --local-k8s-dir=$KTOP --migration-test=true \
26-
# --do-driver-build=false --gce-zone=${GCE_PD_ZONE}
27+
# --do-driver-build=true --gce-zone=${GCE_PD_ZONE}

test/run-k8s-integration-migration.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,21 @@ readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable}"
1414
readonly boskos_resource_type="${GCE_PD_BOSKOS_RESOURCE_TYPE:-gce-project}"
1515
readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
1616
export GCE_PD_VERBOSITY=9
17+
readonly GCE_PD_TEST_FOCUS="\s[V|v]olume\sexpand|\[sig-storage\]\sIn-tree\sVolumes\s\[Driver:\sgcepd\]\s\[Testpattern:\sDynamic\sPV|allowedTopologies|Pod\sDisks|PersistentVolumes\sDefault"
18+
19+
# TODO(#167): Enable reconstructions tests
20+
# TODO: Enabled inline volume tests
21+
# TODO: Fix and enable the following tests. They all exhibit the same testing infra error:
22+
# PersistentVolumes\sGCEPD|\[sig-storage\]\sIn-tree\sVolumes\s\[Driver:\sgcepd\]\s\[Testpattern:.*
23+
24+
# The Error: "PV Create API error: persistentvolumes "gce-" is forbidden: error
25+
# querying GCE PD volume : can not fetch disk, zone is specified
26+
# ("us-central1-b"), but disk name is empty"
1727

1828
make -C ${PKGDIR} test-k8s-integration
1929
${PKGDIR}/bin/k8s-integration-test --kube-version=${GCE_PD_KUBE_VERSION:-master} \
2030
--kube-feature-gates="CSIMigration=true,CSIMigrationGCE=true" --run-in-prow=true \
2131
--deploy-overlay-name=${overlay_name} --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
2232
--do-driver-build=${do_driver_build} --boskos-resource-type=${boskos_resource_type} \
23-
--migration-test=true --test-focus="\[sig-storage\]\sIn-tree\sVolumes\s\[Driver:\sgcepd\]\s\[Testpattern:\sDynamic\sPV.*" \
33+
--migration-test=true --test-focus=${GCE_PD_TEST_FOCUS} \
2434
--gce-zone="us-central1-b"

0 commit comments

Comments
 (0)