From 3adde390ca66b4c7b23650f5c159dfa081f210d7 Mon Sep 17 00:00:00 2001 From: Seth Zegelstein Date: Fri, 5 Apr 2024 03:13:05 +0000 Subject: [PATCH] contrib/aws: Add Windows Test Signed-off-by: Seth Zegelstein --- contrib/aws/Jenkinsfile | 5 +++-- contrib/aws/common.groovy | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/contrib/aws/Jenkinsfile b/contrib/aws/Jenkinsfile index 80ab2091262..f4ebbcbf4a6 100644 --- a/contrib/aws/Jenkinsfile +++ b/contrib/aws/Jenkinsfile @@ -71,7 +71,7 @@ pipeline { stages["1_g4dn_ubuntu2004_shm_disable-cma"] = common.get_test_stage("1_g4dn_ubuntu2004_shm_disable-cma", env.BUILD_TAG, "ubuntu2004", "g4dn.8xlarge", 1, "us-east-1", "libfabric_pr_test.yaml", addl_args_pr + "--test-libfabric-provider shm --enable-cma false") // TODO: Get Single Node Windows test working - // stages["EFA_Windows_Test"] = common.get_single_node_windows_test_stage("EFA_Windows_Test") + stages["EFA_Windows_Test"] = common.get_single_node_windows_test_stage("EFA_Windows_Test") // Multi Node Tests - EFA stages["2_hpc6a_alinux2_efa"] = common.get_test_stage("2_hpc6a_alinux2_efa", env.BUILD_TAG, "alinux2", "hpc6a.48xlarge", 2, "eu-north-1", "libfabric_pr_test.yaml", addl_args_pr) @@ -114,7 +114,8 @@ pipeline { } failure { sh ''' - echo FAILURE + . venv/bin/activate + ./PortaFiducia/scripts/delete_manual_cluster.py --cluster-name WindowsLibfabricCi_${env.CHANGE_ID}_* ''' } aborted { diff --git a/contrib/aws/common.groovy b/contrib/aws/common.groovy index 4a128537b83..09afd330ba8 100644 --- a/contrib/aws/common.groovy +++ b/contrib/aws/common.groovy @@ -90,14 +90,18 @@ def get_cluster_name(build_tag, os, instance_type) { return cluster_name } -def get_single_node_windows_test_stage(stage_name) { +def get_single_node_windows_test_stage(stage_name, pr_id) { /* * Get Windows Stage */ return { stage("${stage_name}") { def ret = sh ( - script: ". venv/bin/activate; cd PortaFiducia/scripts; env AWS_DEFAULT_REGION=us-west-2 ./test_orchestrator_windows.py public", + script: """ + . venv/bin/activate; + cd PortaFiducia/scripts; + env AWS_DEFAULT_REGION=us-west-2 ./test_orchestrator_windows.py --ci public --s3-bucket-name libfabric-ci-windows-prod-test-output --pull-request-id ${env.CHANGE_ID}; + """, returnStatus: true ) if (ret == 65)