Skip to content

Commit 35e045a

Browse files
committed
Revert "Add some test code to be deleted"
This reverts commit c83a119.
1 parent c83a119 commit 35e045a

File tree

2 files changed

+19
-25
lines changed

2 files changed

+19
-25
lines changed

Jenkinsfile

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
99
ansiColor('xterm') {
1010
catchError {
1111
parallel([
12-
// 'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
13-
// 'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
14-
// 'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
15-
// 'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
16-
// 'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
17-
// 'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
18-
// 'oss-ciGroup4': kibanaPipeline.getOssCiGroupWorker(4),
19-
// 'oss-ciGroup5': kibanaPipeline.getOssCiGroupWorker(5),
20-
// 'oss-ciGroup6': kibanaPipeline.getOssCiGroupWorker(6),
21-
// 'oss-ciGroup7': kibanaPipeline.getOssCiGroupWorker(7),
22-
// 'oss-ciGroup8': kibanaPipeline.getOssCiGroupWorker(8),
23-
// 'oss-ciGroup9': kibanaPipeline.getOssCiGroupWorker(9),
24-
// 'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
25-
// 'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
26-
// 'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
27-
// 'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' }),
28-
// 'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld './test/scripts/jenkins_accessibility.sh' }),
29-
// 'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }),
30-
// ]),
12+
'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
13+
'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
14+
'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
15+
'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
16+
'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
17+
'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
18+
'oss-ciGroup4': kibanaPipeline.getOssCiGroupWorker(4),
19+
'oss-ciGroup5': kibanaPipeline.getOssCiGroupWorker(5),
20+
'oss-ciGroup6': kibanaPipeline.getOssCiGroupWorker(6),
21+
'oss-ciGroup7': kibanaPipeline.getOssCiGroupWorker(7),
22+
'oss-ciGroup8': kibanaPipeline.getOssCiGroupWorker(8),
23+
'oss-ciGroup9': kibanaPipeline.getOssCiGroupWorker(9),
24+
'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
25+
'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
26+
'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
27+
'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' }),
28+
'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld './test/scripts/jenkins_accessibility.sh' }),
29+
'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }),
30+
]),
3131
'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
3232
'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
3333
'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),

vars/kibanaPipeline.groovy

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,10 @@ def jobRunner(label, useRamDisk, closure) {
129129

130130
def scmVars
131131

132-
def count = 0
133132
// Try to clone from Github up to 8 times, waiting 15 secs between attempts
134133
retry(8) {
135134
try {
136-
count++
137135
scmVars = checkout scm
138-
139-
if (count < 2) {
140-
error("TODO delete me")
141-
}
142136
} catch (ex) {
143137
sleep 15
144138
throw ex

0 commit comments

Comments
 (0)