Skip to content

Commit 3eac567

Browse files
authored
Merge pull request #31478 from def-/pr-hetzner-cargo-test
ci: Move cargo test to Hetzner (and disable real-S3 tests)
2 parents 6ab6504 + b0fe524 commit 3eac567

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

ci/test/pipeline.template.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,10 @@ steps:
287287
# some tests run into stack overflows
288288
RUST_MIN_STACK: "4194304"
289289
plugins:
290-
- ./ci/plugins/scratch-aws-access: ~
291290
- ./ci/plugins/mzcompose:
292291
composition: cargo-test
293292
agents:
294-
# Because of scratch-aws-access
295-
queue: builder-linux-aarch64-mem
293+
queue: hetzner-x86-64-dedi-32cpu-128gb
296294

297295
- id: testdrive
298296
label: "Testdrive"

src/aws-util/src/s3_uploader.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ mod tests {
379379
#[mz_ore::test(tokio::test(flavor = "multi_thread"))]
380380
#[cfg_attr(coverage, ignore)] // https://github.com/MaterializeInc/database-issues/issues/5586
381381
#[cfg_attr(miri, ignore)] // error: unsupported operation: can't call foreign function `TLS_method` on OS `linux`
382+
#[ignore] // TODO: Reenable against minio so it can run locally
382383
async fn multi_part_upload_success() -> Result<(), S3MultiPartUploadError> {
383384
let sdk_config = defaults().load().await;
384385
let (bucket, key) = match s3_bucket_key_for_test() {
@@ -430,6 +431,7 @@ mod tests {
430431
#[mz_ore::test(tokio::test(flavor = "multi_thread"))]
431432
#[cfg_attr(coverage, ignore)] // https://github.com/MaterializeInc/database-issues/issues/5586
432433
#[cfg_attr(miri, ignore)] // error: unsupported operation: can't call foreign function `TLS_method` on OS `linux`
434+
#[ignore] // TODO: Reenable against minio so it can run locally
433435
async fn multi_part_upload_buffer() -> Result<(), S3MultiPartUploadError> {
434436
let sdk_config = defaults().load().await;
435437
let (bucket, key) = match s3_bucket_key_for_test() {
@@ -488,6 +490,7 @@ mod tests {
488490
#[mz_ore::test(tokio::test(flavor = "multi_thread"))]
489491
#[cfg_attr(coverage, ignore)] // https://github.com/MaterializeInc/database-issues/issues/5586
490492
#[cfg_attr(miri, ignore)] // error: unsupported operation: can't call foreign function `TLS_method` on OS `linux`
493+
#[ignore] // TODO: Reenable against minio so it can run locally
491494
async fn multi_part_upload_no_data() -> Result<(), S3MultiPartUploadError> {
492495
let sdk_config = defaults().load().await;
493496
let (bucket, key) = match s3_bucket_key_for_test() {

src/persist/src/s3.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,6 +1094,7 @@ mod tests {
10941094
#[mz_ore::test(tokio::test(flavor = "multi_thread"))]
10951095
#[cfg_attr(coverage, ignore)] // https://github.com/MaterializeInc/database-issues/issues/5586
10961096
#[cfg_attr(miri, ignore)] // error: unsupported operation: can't call foreign function `TLS_method` on OS `linux`
1097+
#[ignore] // TODO: Reenable against minio so it can run locally
10971098
async fn s3_blob() -> Result<(), ExternalError> {
10981099
let config = match S3BlobConfig::new_for_test().await? {
10991100
Some(client) => client,

src/storage-operators/src/s3_oneshot_sink/pgcopy.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ mod tests {
214214
#[mz_ore::test(tokio::test(flavor = "multi_thread"))]
215215
#[cfg_attr(coverage, ignore)] // https://github.com/MaterializeInc/database-issues/issues/5586
216216
#[cfg_attr(miri, ignore)] // error: unsupported operation: can't call foreign function `TLS_method` on OS `linux`
217+
#[ignore] // TODO: Reenable against minio so it can run locally
217218
async fn test_multiple_files() -> Result<(), anyhow::Error> {
218219
let sdk_config = mz_aws_util::defaults().load().await;
219220
let (bucket, path) = match s3_bucket_path_for_test() {

0 commit comments

Comments
 (0)