Skip to content

Commit b9551f7

Browse files
committed
terraform test: Add --no-test
1 parent f53418b commit b9551f7

File tree

4 files changed

+320
-277
lines changed

4 files changed

+320
-277
lines changed

ci/plugins/mzcompose/hooks/pre-exit

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ ci_collapsed_heading ":docker: Purging all existing docker containers and volume
149149
docker ps --all --quiet | xargs --no-run-if-empty docker rm --force --volumes
150150

151151
if [ "$BUILDKITE_STEP_KEY" = "terraform-aws" ]; then
152-
run run aws-temporary --no-setup --no-run-testdrive-files || true
152+
run run aws-temporary --no-setup --no-test || true
153153
elif [ "$BUILDKITE_STEP_KEY" = "terraform-aws-upgrade" ]; then
154-
run run aws-upgrade --no-setup --no-run-testdrive-files || true
154+
run run aws-upgrade --no-setup --no-test || true
155155
elif [ "$BUILDKITE_STEP_KEY" = "terraform-gcp" ]; then
156-
run run gcp-temporary --no-setup --no-run-testdrive-files || true
156+
run run gcp-temporary --no-setup --no-test || true
157157
elif [ "$BUILDKITE_STEP_KEY" = "terraform-azure" ]; then
158-
run run azure-temporary --no-setup --no-run-testdrive-files || true
158+
run run azure-temporary --no-setup --no-test || true
159159
fi
160160
rm -rf ~/.kube # Remove potential state from E2E Terraform tests
161161

src/testdrive/src/action.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ impl Run for PosCommand {
776776
consistency::skip_consistency_checks(builtin, state)
777777
}
778778
"check-shard-tombstone" => {
779-
consistency::run_check_shard_tombstoned(builtin, state).await
779+
consistency::run_check_shard_tombstone(builtin, state).await
780780
}
781781
"fivetran-destination" => {
782782
fivetran::run_destination_command(builtin, state).await

src/testdrive/src/action/consistency.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ pub async fn run_consistency_checks(state: &State) -> Result<ControlFlow, anyhow
9494
/// Checks if a shard in Persist has been tombstoned.
9595
///
9696
/// TODO(parkmycar): Run this as part of the consistency checks, instead of as a specific command.
97-
pub async fn run_check_shard_tombstoned(
97+
pub async fn run_check_shard_tombstone(
9898
mut cmd: BuiltinCommand,
9999
state: &State,
100100
) -> Result<ControlFlow, anyhow::Error> {
101101
let shard_id = cmd.args.string("shard-id")?;
102-
check_shard_tombstoned(state, &shard_id).await?;
102+
check_shard_tombstone(state, &shard_id).await?;
103103
Ok(ControlFlow::Continue)
104104
}
105105

@@ -237,8 +237,8 @@ async fn check_catalog_state(state: &State) -> Result<(), anyhow::Error> {
237237
}
238238

239239
/// Checks if the provided `shard_id` is a tombstone, returning an error if it's not.
240-
async fn check_shard_tombstoned(state: &State, shard_id: &str) -> Result<(), anyhow::Error> {
241-
println!("$ check-shard-tombstoned {shard_id}");
240+
async fn check_shard_tombstone(state: &State, shard_id: &str) -> Result<(), anyhow::Error> {
241+
println!("$ check-shard-tombstone {shard_id}");
242242

243243
let (Some(consensus_uri), Some(blob_uri)) =
244244
(&state.persist_consensus_url, &state.persist_blob_url)

0 commit comments

Comments
 (0)