Skip to content

Commit

Permalink
Test commit
Browse files Browse the repository at this point in the history
  • Loading branch information
azasypkin committed Jul 7, 2020
1 parent 0d1e2cb commit 799ce7c
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 35 deletions.
58 changes: 29 additions & 29 deletions .ci/jobs.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# This file is needed by functionalTests:ensureAllTestsInCiGroup for the list of ciGroups. That must be changed before this file can be removed

JOB:
- kibana-intake
- x-pack-intake
- kibana-firefoxSmoke
- kibana-ciGroup1
- kibana-ciGroup2
- kibana-ciGroup3
- kibana-ciGroup4
- kibana-ciGroup5
- kibana-ciGroup6
- kibana-ciGroup7
- kibana-ciGroup8
- kibana-ciGroup9
- kibana-ciGroup10
- kibana-ciGroup11
- kibana-ciGroup12
- kibana-accessibility
- kibana-visualRegression
# - kibana-intake
# - x-pack-intake
# - kibana-firefoxSmoke
# - kibana-ciGroup1
# - kibana-ciGroup2
# - kibana-ciGroup3
# - kibana-ciGroup4
# - kibana-ciGroup5
# - kibana-ciGroup6
# - kibana-ciGroup7
# - kibana-ciGroup8
# - kibana-ciGroup9
# - kibana-ciGroup10
# - kibana-ciGroup11
# - kibana-ciGroup12
# - kibana-accessibility
# - kibana-visualRegression

# make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
- x-pack-firefoxSmoke
- x-pack-ciGroup1
- x-pack-ciGroup2
- x-pack-ciGroup3
- x-pack-ciGroup4
- x-pack-ciGroup5
# - x-pack-firefoxSmoke
# - x-pack-ciGroup1
# - x-pack-ciGroup2
# - x-pack-ciGroup3
# - x-pack-ciGroup4
# - x-pack-ciGroup5
- x-pack-ciGroup6
- x-pack-ciGroup7
- x-pack-ciGroup8
- x-pack-ciGroup9
- x-pack-ciGroup10
- x-pack-accessibility
- x-pack-visualRegression
# - x-pack-ciGroup7
# - x-pack-ciGroup8
# - x-pack-ciGroup9
# - x-pack-ciGroup10
# - x-pack-accessibility
# - x-pack-visualRegression

# `~` is yaml for `null`
exclude: ~
12 changes: 6 additions & 6 deletions x-pack/scripts/functional_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
*/

const alwaysImportedTests = [
require.resolve('../test/functional/config.js'),
/* require.resolve('../test/functional/config.js'),
require.resolve('../test/security_solution_endpoint/config.ts'),
require.resolve('../test/functional_with_es_ssl/config.ts'),
require.resolve('../test/functional/config_security_basic.ts'),
require.resolve('../test/security_functional/login_selector.config.ts'),
require.resolve('../test/security_functional/saml.config.ts'),
require.resolve('../test/security_functional/saml.config.ts'),*/
];
const onlyNotInCoverageTests = [
require.resolve('../test/api_integration/config_security_basic.ts'),
/* require.resolve('../test/api_integration/config_security_basic.ts'),
require.resolve('../test/api_integration/config_security_trial.ts'),
require.resolve('../test/api_integration/config.ts'),
require.resolve('../test/alerting_api_integration/basic/config.ts'),
Expand All @@ -28,9 +28,9 @@ const onlyNotInCoverageTests = [
require.resolve('../test/kerberos_api_integration/anonymous_access.config.ts'),
require.resolve('../test/saml_api_integration/config.ts'),
require.resolve('../test/token_api_integration/config.js'),
require.resolve('../test/oidc_api_integration/config.ts'),
require.resolve('../test/oidc_api_integration/config.ts'),*/
require.resolve('../test/oidc_api_integration/implicit_flow.config.ts'),
require.resolve('../test/observability_api_integration/basic/config.ts'),
/* require.resolve('../test/observability_api_integration/basic/config.ts'),
require.resolve('../test/observability_api_integration/trial/config.ts'),
require.resolve('../test/pki_api_integration/config.ts'),
require.resolve('../test/login_selector_api_integration/config.ts'),
Expand All @@ -53,7 +53,7 @@ const onlyNotInCoverageTests = [
require.resolve('../test/endpoint_api_integration_no_ingest/config.ts'),
require.resolve('../test/reporting_api_integration/config.js'),
require.resolve('../test/functional_embedded/config.ts'),
require.resolve('../test/ingest_manager_api_integration/config.ts'),
require.resolve('../test/ingest_manager_api_integration/config.ts'),*/
];

require('@kbn/plugin-helpers').babelRegister();
Expand Down
1 change: 1 addition & 0 deletions x-pack/test/oidc_api_integration/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
`--plugin-path=${plugin}`,
`--xpack.security.authc.providers=${JSON.stringify(['oidc', 'basic'])}`,
'--xpack.security.authc.oidc.realm="oidc1"',
'--logging.verbose=true',
],
},
};
Expand Down

0 comments on commit 799ce7c

Please sign in to comment.