Skip to content

Commit 4f618dd

Browse files
committed
Fix node context issue
1 parent 439dd7c commit 4f618dd

1 file changed

Lines changed: 38 additions & 40 deletions

File tree

Jenkinsfile-SmokeTest

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -66,38 +66,17 @@ def runSmokeTests(Map args = new LinkedHashMap()) {
6666
if (platform.provider) {
6767
def name = "${platform.browser}-${platform.provider}${suffix}"
6868
processes[name] = {
69-
tinyPods.node {
70-
stage("${name}") {
71-
bedrockRemoteTools.tinyWorkSishTunnel()
72-
bedrockRemoteTools.withRemoteCreds(platform.provider) {
73-
String customArgs = additionalArgs + " --remote ${platform.provider}"
74-
if (platform.provider == "aws") {
75-
customArgs = customArgs + " --sishDomain \"sish.osu.tiny.work\""
76-
}
77-
if (platform.os) {
78-
customArgs = customArgs + " --platformName \"${platform.os}\""
79-
}
80-
81-
generateNPMVersionRouteFile(npm_tag: args.npm_tag, filePath: customRouteFilePath)
82-
updateDependenciesWithTag(npm_tag: args.npm_tag)
83-
bedrockTests(
84-
name: name,
85-
browser: platform.browser,
86-
testDirs: [ "tinymce-angular-component/src/test/ts" ],
87-
bucket: currBucket,
88-
buckets: buckets,
89-
custom: customArgs
90-
)
69+
stage("${name}") {
70+
bedrockRemoteTools.tinyWorkSishTunnel()
71+
bedrockRemoteTools.withRemoteCreds(platform.provider) {
72+
String customArgs = additionalArgs + " --remote ${platform.provider}"
73+
if (platform.provider == "aws") {
74+
customArgs = customArgs + " --sishDomain \"sish.osu.tiny.work\""
9175
}
92-
}
93-
}
94-
}
95-
} else {
96-
// Headless code in case is needed
97-
def name = "headless-${platform.browser}${suffix}"
98-
processes[name] = {
99-
tinyPods.nodeBrowser(browser: platform.browser) {
100-
stage("${name}") {
76+
if (platform.os) {
77+
customArgs = customArgs + " --platformName \"${platform.os}\""
78+
}
79+
10180
generateNPMVersionRouteFile(npm_tag: args.npm_tag, filePath: customRouteFilePath)
10281
updateDependenciesWithTag(npm_tag: args.npm_tag)
10382
bedrockTests(
@@ -106,11 +85,28 @@ def runSmokeTests(Map args = new LinkedHashMap()) {
10685
testDirs: [ "tinymce-angular-component/src/test/ts" ],
10786
bucket: currBucket,
10887
buckets: buckets,
109-
custom: additionalArgs + " --useSelenium"
88+
custom: customArgs
11089
)
11190
}
11291
}
11392
}
93+
} else {
94+
// Headless code in case is needed
95+
def name = "headless-${platform.browser}${suffix}"
96+
processes[name] = {
97+
stage("${name}") {
98+
generateNPMVersionRouteFile(npm_tag: args.npm_tag, filePath: customRouteFilePath)
99+
updateDependenciesWithTag(npm_tag: args.npm_tag)
100+
bedrockTests(
101+
name: name,
102+
browser: platform.browser,
103+
testDirs: [ "tinymce-angular-component/src/test/ts" ],
104+
bucket: currBucket,
105+
buckets: buckets,
106+
custom: additionalArgs + " --useSelenium"
107+
)
108+
}
109+
}
114110
}
115111
}
116112
}
@@ -119,15 +115,17 @@ def runSmokeTests(Map args = new LinkedHashMap()) {
119115
}
120116

121117
timestamps {
122-
stage('deps') {
123-
yarnInstall()
124-
}
118+
tinyPods.node() {
119+
stage('deps') {
120+
yarnInstall()
121+
}
125122

126-
stage('build') {
127-
sh 'yarn build'
128-
}
123+
stage('build') {
124+
sh 'yarn build'
125+
}
129126

130-
stage('tests') {
131-
runSmokeTests(npm_tag: params.NPM_TAG ?: 'latest')
127+
stage('tests') {
128+
runSmokeTests(npm_tag: params.NPM_TAG ?: 'latest')
129+
}
132130
}
133131
}

0 commit comments

Comments
 (0)