Add arm legacy backend stress jobs

2 files changed, 67 insertions, 2 deletions

diff --git a/netci.groovy b/netci.groovy
index f5d37004ea..44a05dab24 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -1624,7 +1624,21 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
                     }
                     break
                 case 'arm':
-                    assert (scenario == 'default') || (scenario == 'pri1r2r') || (scenario == 'gcstress0x3') || (scenario == 'gcstress0xc')
+                    def validArmWindowsScenarios = [ "default",
+                                                     "pri1r2r",
+                                                     "zapdisable",
+                                                     "minopts",
+                                                     "tailcallstress",
+                                                     "jitstress1",
+                                                     "jitstress2",
+                                                     "gcstress0x3",
+                                                     "gcstress0xc",
+                                                     "jitstressregs1",
+                                                     "jitstressregs2",
+                                                     "gcstress0xc_jitstress1",
+                                                     "gcstress0xc_jitstress2"]
+
+                    assert validArmWindowsScenarios.contains(scenario)
 
                     // Set time out
                     setTestJobTimeOut(newJob, scenario)
@@ -1921,6 +1935,20 @@ combinedScenarios.each { scenario ->
 
                         switch (architecture) {
                             case 'arm':
+                                if ((scenario != 'gcstress0x3') &&
+                                    (scenario != 'gcstress0xc') &&
+                                    (scenario != 'jitstress1') &&
+                                    (scenario != 'jitstress2') &&
+                                    (scenario != 'jitstressregs1') &&
+                                    (scenario != 'jitstressregs2') &&
+                                    (scenario != 'gcstress0xc_jitstress1') &&
+                                    (scenario != 'gcstress0xc_jitstress2') &&
+                                    (scenario != 'minopts') &&
+                                    (scenario != 'tailcallstress') &&
+                                    (scenario != 'zapdisable')) {
+                                        return
+                                    }
+                                    break
                             case 'arm64':
                                 if ((scenario != 'gcstress0x3') && (scenario != 'gcstress0xc')) {
                                     return
diff --git a/tests/scripts/arm64_post_build.py b/tests/scripts/arm64_post_build.py
index 1af5415310..338063a2f5 100644
--- a/tests/scripts/arm64_post_build.py
+++ b/tests/scripts/arm64_post_build.py
@@ -246,8 +246,45 @@ def validate_args(args):
 
    valid_arches = ["arm", "arm64"]
    valid_build_types = ["debug", "checked", "release"]
-   valid_scenarios = ["default", "pri1r2r", "gcstress0x3", "gcstress0xc"]
 
+   valid_jit_stress_regs_numbers = ["1", "2", "3", "4", "8", "10", "80"]
+
+   jit_stress_scenarios = ["jitstress1", "jitstress2"]
+   jitstressregs_scenarios = ["jitstressregs" + item for item in valid_jit_stress_regs_numbers]
+   gc_stress_scenarios = ["gcstress0x3", "gcstress0xc"]
+   
+   combo_scenarios = []
+
+   # GCStress 3 + JitStressX
+   combo_scenarios += [gc_stress_scenarios[0] + "_" + item for item in jit_stress_scenarios]
+
+   # GCStress C + JitStressX
+   combo_scenarios += [gc_stress_scenarios[1] + "_" + item for item in jit_stress_scenarios]
+   
+   # GCStress 3 + JitStressRegsX
+   combo_scenarios += [gc_stress_scenarios[0] + "_" + item for item in jitstressregs_scenarios]
+
+   # GCStress C + JitStressRegsX
+   combo_scenarios += [gc_stress_scenarios[1] + "_" + item for item in jitstressregs_scenarios]
+
+   combo_scenarios.append("minopts_zapdisable")
+   combo_scenarios.append("tailcallstress_zapdisable")
+
+   valid_scenarios = ["default",
+                      "pri1r2r",
+                      "minopts",
+                      "zapdisable",
+                      "tailcallstress",
+                      "zapdisable"]
+
+   valid_scenarios += jitstressregs_scenarios
+   valid_scenarios += jit_stress_scenarios
+   valid_scenarios += gc_stress_scenarios
+   valid_scenarios += combo_scenarios
+
+   # Add the ryujit scenarios
+   valid_scenarios += ["ryujit_" + item for item in valid_scenarios]
+   
    validate_arg(repo_root, lambda item: os.path.isdir(item))
    validate_arg(arch, lambda item: item.lower() in valid_arches)
    validate_arg(build_type, lambda item: item.lower() in valid_build_types)