Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 0 additions & 64 deletions .travis.yml

This file was deleted.

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Elastic APM Real User Monitoring (RUM) JavaScript agent

[![Build Status in Travis](https://travis-ci.org/elastic/apm-agent-rum-js.svg?branch=master)](https://travis-ci.org/elastic/apm-agent-rum-js)
[![Build Status in Jenkins](https://apm-ci.elastic.co/buildStatus/icon?job=apm-agent-rum%2Fapm-agent-rum-mbp%2Fmaster)](https://apm-ci.elastic.co/job/apm-agent-rum/job/apm-agent-rum-mbp/job/master/)
[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://github.com/feross/standard)
[![codecov](https://codecov.io/gh/elastic/apm-agent-rum-js/branch/master/graph/badge.svg)](https://codecov.io/gh/elastic/apm-agent-rum-js)
Expand Down
15 changes: 2 additions & 13 deletions dev-utils/karma.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,21 +105,10 @@ function prepareConfig(config, packageName) {
console.log('Global test Configuration: ', globalConfig)
const { agentConfig, testConfig } = globalConfig

const { isTravis, isJenkins, sauceLabs: isSauce } = testConfig
const { isJenkins, sauceLabs: isSauce } = testConfig
let buildId = `ApmJs-${agentConfig.name}`

if (isTravis) {
console.log('prepareConfig: Run in Travis')
buildId =
buildId +
' - TRAVIS #' +
process.env.TRAVIS_BUILD_NUMBER +
' (' +
process.env.TRAVIS_BUILD_ID +
')'
config.plugins.push('karma-chrome-launcher')
config.browsers = ['ChromeHeadless']
} else if (isJenkins) {
if (isJenkins) {
console.log('prepareConfig: Run in Jenkins')
buildId =
buildId +
Expand Down
5 changes: 2 additions & 3 deletions dev-utils/test-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,16 @@ function getSauceConnectOptions() {
accessKey: process.env.SAUCE_ACCESS_KEY,
logger: console.log,
noSslBumpDomains: 'all',
tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER || process.env.BUILD_NUMBER,
tunnelIdentifier: process.env.BUILD_NUMBER,
connectRetries: 3
}
}

function getTestEnvironmentVariables() {
return {
branch: process.env.TRAVIS_BRANCH || process.env.BRANCH_NAME,
branch: process.env.BRANCH_NAME,
mode: process.env.MODE,
sauceLabs: process.env.MODE && process.env.MODE.startsWith('saucelabs'),
isTravis: process.env.TRAVIS,
isJenkins: process.env.JENKINS_URL,
serverUrl: process.env.APM_SERVER_URL || DEFAULT_APM_SERVER_URL,
mockBackendUrl: 'http://localhost:8003',
Expand Down
11 changes: 0 additions & 11 deletions scripts/lint-commits.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,4 @@ if [[ -n "${JENKINS_URL}" ]]; then
exit ${titleResult}
fi
fi
# Run if we're not on Travis
elif [[ -z "$CI" ]]; then
GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)

if [[ "$GIT_BRANCH" == "master" ]]; then
# If on master, just test the latest commit
commitlint --edit
else
# If on a branch, test all commits between this branch and master
commitlint --from=master
fi
fi