11#! groovy
2- @Library (' waluigi@v3.2 .0' ) _
2+ @Library (' waluigi@v4.0 .0' ) _
33
44standardProperties()
55
@@ -12,7 +12,7 @@ node("primary") {
1212 }
1313
1414 stage(" dependencies" ) {
15- sh " yarn install"
15+ sh " yarn install --frozen-lockfile "
1616 }
1717
1818 stage(" stamp" ) {
@@ -27,41 +27,15 @@ node("primary") {
2727 sh " yarn lint"
2828 }
2929
30- stage(" test" ) {
31- def permutations = [
32- [ name : " win10Chrome" , os : " windows-10" , browser : " chrome" ],
33- [ name : " win10FF" , os : " windows-10" , browser : " firefox" ]
34- // [ name: "win10Edge", os: "windows-10", browser: "MicrosoftEdge" ]
35- ]
36-
37- def processes = [:]
38-
39- for (int i = 0 ; i < permutations. size(); i++ ) {
40- def permutation = permutations. get(i);
41- def name = permutation. name;
42- processes[name] = {
43- node(" bedrock-" + permutation. os) {
44- echo " Clean workspace"
45- cleanWs()
46-
47- echo " Checkout"
48- checkout scm
49-
50- echo " Installing tools"
51- yarnInstall()
52-
53- echo " Platform: browser tests for " + permutation. name
54- bedrockTests(permutation. name, permutation. browser, " src/test/ts/browser" )
55- }
56- }
57- }
58-
59- parallel processes
60- }
30+ def platforms = [
31+ [ name : " win10Chrome" , os : " windows-10" , browser : " chrome" ],
32+ [ name : " win10FF" , os : " windows-10" , browser : " firefox" ]
33+ ]
34+ bedrockBrowsers(platforms : platforms, testDirs : [ " src/test/ts/browser" ])
6135
6236 stage(" publish" ) {
63- sh " yarn beehive-flow publish"
6437 sshagent(credentials : [' jenkins2-github' ]) {
38+ sh " yarn beehive-flow publish"
6539 sh " yarn beehive-flow advance-ci"
6640 }
6741 }
0 commit comments