diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index aeb91d898..000000000 --- a/.travis.yml +++ /dev/null @@ -1,64 +0,0 @@ -sudo: required -language: node_js -services: - - docker -node_js: - - '12' - -before_install: - - nvm install-latest-npm - -cache: - directories: - - $HOME/.npm - -env: - global: - - APM_SERVER_PORT=8200 - - APM_SERVER_URL=http://localhost:8001 - - MODE=none - - DISPLAY=:0 - -stages: - - check - - test - -jobs: - allow_failures: - - script: npm run bundlesize - include: - - stage: check - script: npm run lint - name: 'Lint' - - stage: check - script: npm run bundlesize - name: 'Analyse size of JS bundles' - - stage: test - env: - - STACK_VERSION=8.0.0-SNAPSHOT - - SCOPE=@elastic/apm-rum-core - - stage: test - env: - - STACK_VERSION=8.0.0-SNAPSHOT - - SCOPE=@elastic/apm-rum - - stage: test - env: - - STACK_VERSION=8.0.0-SNAPSHOT - - SCOPE=@elastic/apm-rum-react - - stage: test - env: - - STACK_VERSION=8.0.0-SNAPSHOT - - SCOPE=@elastic/apm-rum-angular - - stage: test - env: - - STACK_VERSION=8.0.0-SNAPSHOT - - SCOPE=@elastic/apm-rum-vue -addons: - apt: - packages: - - xsltproc - - libxml2-utils - -script: - - NODEJS_VERSION=$(cat ./dev-utils/.node-version) docker-compose -f ./dev-utils/docker-compose.yml up -d wait-for-apm-server - - npm run test diff --git a/README.md b/README.md index e34f65829..27538b13d 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/dev-utils/karma.js b/dev-utils/karma.js index 8a91db09d..d736a6125 100644 --- a/dev-utils/karma.js +++ b/dev-utils/karma.js @@ -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 + diff --git a/dev-utils/test-config.js b/dev-utils/test-config.js index e0e9f3dde..4a1dc0201 100644 --- a/dev-utils/test-config.js +++ b/dev-utils/test-config.js @@ -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', diff --git a/scripts/lint-commits.sh b/scripts/lint-commits.sh index bae8d6f87..0e389bd92 100755 --- a/scripts/lint-commits.sh +++ b/scripts/lint-commits.sh @@ -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