Merge remote-tracking branch 'upstream/master' into ibm

AdamBrousseau · AdamBrousseau · commit 925a6687cd1c · 2021-10-05T11:00:13.000-04:00
diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -256,7 +256,10 @@ class Config17 {
                 arch                 : 'riscv64',
                 configureArgs        : '--enable-dtrace --with-native-debug-symbols=none',
                 buildArgs            : '-r https://github.com/openjdk/jdk-sandbox -b riscv-port-branch --custom-cacerts false --disable-adopt-branch-safety',
-                test                 : 'default'
+                test                : [
+                        nightly: ['sanity.openjdk'],
+                        weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
+                ]
         ]
 
   ]

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,10 @@ class Config17 {`
`256`	`256`	`arch : 'riscv64',`
`257`	`257`	`configureArgs : '--enable-dtrace --with-native-debug-symbols=none',`
`258`	`258`	`buildArgs : '-r https://github.com/openjdk/jdk-sandbox -b riscv-port-branch --custom-cacerts false --disable-adopt-branch-safety',`
`259`		`- test : 'default'`
	`259`	`+ test : [`
	`260`	`+ nightly: ['sanity.openjdk'],`
	`261`	`+ weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']`
	`262`	`+ ]`
`260`	`263`	`]`
`261`	`264`
`262`	`265`	`]`