提交 b9748f73 编写于 作者: S Sebastian Florek 提交者: Marcin Maciaszczyk

Update travis configuration (#3477)

* Update travis configuration

* Fix version error

* Improve git clone on travis

* Bump minikube/heapster versions
上级 5a121dd0
......@@ -3,9 +3,12 @@
sudo: required
dist: xenial
group: edge
language: node_js
node_js: 8.11.3
node_js: 11.6.0
git:
depth: 250
quiet: true
cache:
directories:
......@@ -19,7 +22,7 @@ before_install:
- ln -s $TRAVIS_BUILD_DIR/vendor $TRAVIS_BUILD_DIR/.tmp/src/github.com/kubernetes/dashboard/src/app/backend/vendor
before_script:
- eval "$(gimme 1.11.2)"
- eval "$(gimme 1.11.4)"
- docker --version
jobs:
......@@ -28,18 +31,14 @@ jobs:
script: npm run check
- script: npm run test:coverage
after_success:
- rm -rf $TRAVIS_BUILD_DIR/.tmp
- bash <(curl -s https://codecov.io/bash)
- addons:
# Run tests that require a browser on SauceLabs CI provider.
# Read more at: https://saucelabs.com
sauce_connect: true
jwt:
secure: NfCHCQULhYH0JUobRTBGF4QuQxMoj0Zs9iH71oSgI+eW7ClpNDp0cEF8h+IelTdPGQY7T9Kz4tyrZkUeXD5Mi/jjZT0YnjxSS8Ip6rRRxPDCWEmxbhOrZTEBXYfa4vqCY7rLnor8g579WOZ+RyoiotPC8tlc955nEgBk1jDxyAgXoUy0SdA/05r6A2IqKfs95u+yq0nsYqYJBj/3onx2SQv94eMQ7qq9GMhsAWMoNzLsBfU8AkZLsJ2w/W2p9tQURNk1hgCEewMwe6E6+G3XMAnDoIXBHkRAU335FBUE+f2kZ5Gl3GKE8pvWJaUWLePzfBvlmzCi4GW6lPlrRE5m+3wiiSzcbEAJnWOVPBrD/6mogYaJ5RijKzWk5o91eV8lU/lttp0hpH7PdWj1CEZk7EmyKO7ZF7ScALOZgs/dGyGgWcAvA0zwCDzdxXIitq9Eegc0xU+bB9jyJgi4dV9H1T1prwtS/TdhBU6sXKEjFVIgPUQa/TqBgaSs634kqRueH3bNfSD8Nf655AFeSgwdGiW0pBDm/WESftFWBMW3eV+KYtBFmGU/b3g+eEmd04j+lIOkK6EzU1QetUCKhpeMc5509So/+k4XghPHldWYzRldpY0kbp32VnAY8egsDdAHxgPrs2mTIDD1W//D/XJI9J072/z47GN4Af5zryz/3Nc=
script:
- npm run cluster
- npm run test:e2e
env:
- SAUCE_USERNAME=k8s-dashboard-ci
- KUBE_DASHBOARD_KUBECONFIG=$HOME/.kube/config
- stage: deploy
script:
......
......@@ -50,7 +50,6 @@ module.exports = function(config) {
coverageIstanbulReporter: {
dir: path.join(__dirname, '..', 'coverage'),
dir: require('path').join(__dirname, 'coverage'),
reports: ['html', 'lcovonly'],
'report-config': {
html: {subdir: 'html'},
......
......@@ -34,8 +34,8 @@ function createConfig() {
}
};
// Use custom browser configuration when running on Travis CI.
if (!!process.env.TRAVIS) {
// Use custom browser configuration when running on Travis CI and master/tag is being build.
if (!!process.env.TRAVIS && !process.env.TRAVIS_PULL_REQUEST) {
let name = `Integration tests ${process.env.TRAVIS_REPO_SLUG}, build ` +
`${process.env.TRAVIS_BUILD_NUMBER}, job ${process.env.TRAVIS_JOB_NUMBER}`;
if (process.env.TRAVIS_PULL_REQUEST !== 'false') {
......@@ -45,26 +45,21 @@ function createConfig() {
config.sauceUser = process.env.SAUCE_USERNAME;
config.sauceKey = process.env.SAUCE_ACCESS_KEY;
config.multiCapabilities = [
{
'browserName': 'chrome',
'chromeOptions': {'args': ['--headless', '--disable-gpu', '--window-size=800,600']},
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
'name': name,
},
{
'browserName': 'firefox',
'moz:firefoxOptions': {'args': ['--headless']},
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
'name': name,
},
];
config.capabilities = {
'browserName': 'chrome',
'chromeOptions': {'args': ['--headless', '--disable-gpu', '--window-size=800,600']},
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
'name': name,
};
// Limit concurrency to not exhaust saucelabs resources for the CI user.
config.maxSessions = 1;
} else {
config.capabilities = {'browserName': 'chrome'};
config.capabilities = {
'browserName': 'chrome',
'chromeOptions': {'args': ['--headless', '--disable-gpu', '--window-size=800,600']},
};
}
return config;
......
......@@ -43,10 +43,10 @@ GOLINT_BIN="${CACHE_DIR}/golangci-lint"
ARCH=$(uname | awk '{print tolower($0)}')
# Local cluster configuration (check start-cluster.sh script for more details).
HEAPSTER_VERSION="v1.4.0"
HEAPSTER_VERSION="v1.5.4"
HEAPSTER_PORT=8082
MINIKUBE_VERSION=v0.24.1
MINIKUBE_K8S_VERSION=v1.8.0
MINIKUBE_VERSION=v0.32.0
MINIKUBE_K8S_VERSION=v1.12.4
MINIKUBE_BIN=${CACHE_DIR}/minikube-${MINIKUBE_VERSION}
# Setup logger.
......
......@@ -10,11 +10,13 @@ const gitInfo = gitDescribeSync({
});
gitInfo.packageVersion = version;
gitInfo.semver.loose = false;
gitInfo.semver.options = {
includePrerelease: false,
Object.assign(gitInfo.semver, {
loose: false,
};
options: {
includePrerelease: false,
loose: false,
}
});
const file =
resolve(__dirname, '..', '..', 'src/', 'app', 'frontend', 'environments', 'version.ts');
......
......@@ -48,7 +48,7 @@
"fix:license": "gulp update-license-headers",
"clean": "rm -rf .go_workspace .tmp coverage dist npm-debug.log",
"postversion": "node aio/scripts/version.js",
"postinstall": "node aio/scripts/version.js && webdriver-manager update && go get golang.org/x/tools/cmd/goimports"
"postinstall": "node aio/scripts/version.js && ./node_modules/protractor/bin/webdriver-manager update --gecko=false && go get golang.org/x/tools/cmd/goimports"
},
"husky": {
"hooks": {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册