fixes artifact pattern

elastic · Mar 19, 2020 · 354ab32 · 354ab32
1 parent 26a8b70
commit 354ab32
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,8 +8,38 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
     catchError {
       retryable.enable()
       parallel([
+        'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
+        'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
+        'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
+          // 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
+          'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
+          'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
+          'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
+          'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
+          'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
+          'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
+          'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
+          'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
+          'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
+          'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
+          'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
+          'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
+          'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
+          // 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
+        ]),
         'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
           // 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
+          'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
+          'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
+          'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
+          'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
+          'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
+          'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
+          'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
+          'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
+          'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
+          'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
+          'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
           'xpack-siemCypress': kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh'),
           // 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
         ]),

diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
@@ -98,7 +98,6 @@ def withGcsArtifactUpload(workerName, closure) {
   def uploadPrefix = "kibana-ci-artifacts/jobs/${env.JOB_NAME}/${BUILD_NUMBER}/${workerName}"
   def ARTIFACT_PATTERNS = [
     'target/kibana-*/**/*',
-    //'target/kibana-siem/**/*',
     'target/junit/**/*',
     'test/**/screenshots/**/*.png',
     'test/functional/failure_debug/html/*.html',

diff --git a/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts
@@ -29,16 +29,12 @@ import { DETECTIONS } from '../urls/navigation';
 
 describe('Detections', () => {
   beforeEach(() => {
-    // esArchiverLoad('signals');
+    esArchiverLoad('signals');
     loginAndWaitForPage(DETECTIONS);
   });
 
   it('Closes and opens signals', () => {
-    cy.get(NUMBER_OF_SIGNALS)
-      .invoke('text')
-      .should('eql', 'this is a test');
-
-    /* waitForSignalsPanelToBeLoaded();
+    waitForSignalsPanelToBeLoaded();
     waitForSignalsToBeLoaded();
 
     cy.get(NUMBER_OF_SIGNALS)
@@ -155,6 +151,6 @@ describe('Detections', () => {
           .invoke('text')
           .should('eql', `Showing ${numberOfSignalsToBeClosed.toString()} signal`);
         cy.get(SIGNALS).should('have.length', numberOfSignalsToBeClosed);
-      });*/
+      });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/package.json b/x-pack/legacy/plugins/siem/package.json
@@ -8,7 +8,7 @@
     "extract-mitre-attacks": "node scripts/extract_tactics_techniques_mitre.js & node ../../../../scripts/eslint ./public/pages/detection_engine/mitre/mitre_tactics_techniques.ts --fix",
     "build-graphql-types": "node scripts/generate_types_from_graphql.js",
     "cypress:open": "../../../node_modules/.bin/cypress open",
-    "cypress:run": "../../../node_modules/.bin/cypress run --spec ./cypress/integration/detections.spec.ts --reporter ../../../node_modules/cypress-multi-reporters --reporter-options configFile=./reporter_config.json; status=$?; ../../../node_modules/.bin/mochawesome-merge --reportDir ../../../../target/kibana-siem/cypress/results > ../../../../target/kibana-siem/cypress/results/output.json; ../../../../node_modules/.bin/marge ../../../../target/kibana-siem/cypress/results/output.json --reportDir ../../../../target/kibana-siem/cypress/results; mkdir -p ../../../../target/junit && cp ../../../../target/kibana-siem/cypress/results/*.xml ../../../../target/junit/ && exit $status;",
+    "cypress:run": "../../../node_modules/.bin/cypress run --spec ./cypress/integration/**/*.spec.ts --reporter ../../../node_modules/cypress-multi-reporters --reporter-options configFile=./reporter_config.json; status=$?; ../../../node_modules/.bin/mochawesome-merge --reportDir ../../../../target/kibana-siem/cypress/results > ../../../../target/kibana-siem/cypress/results/output.json; ../../../../node_modules/.bin/marge ../../../../target/kibana-siem/cypress/results/output.json --reportDir ../../../../target/kibana-siem/cypress/results; mkdir -p ../../../../target/junit && cp ../../../../target/kibana-siem/cypress/results/*.xml ../../../../target/junit/ && exit $status;",
     "cypress:run-as-ci": "node ../../../../scripts/functional_tests --config ../../../test/siem_cypress/config.ts"
   },
   "devDependencies": {