From 13a4423750d95baa35ac208555a9ee1da9456f82 Mon Sep 17 00:00:00 2001 From: Stephen Donner Date: Fri, 14 Sep 2018 14:15:11 -0700 Subject: [PATCH 1/3] Fix Jenkins build by removing the removed-elsewhere Docker relics --- Jenkinsfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index aaa5af3..2a33448 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,9 +33,7 @@ pipeline { } stages { stage('Lint') { - agent { - dockerfile true - } + agent any steps { sh "tox -e flake8" } @@ -43,18 +41,14 @@ pipeline { stage('Test') { parallel { stage('py36') { - agent { - dockerfile true - } + agent any steps { writeCapabilities(capabilities, 'capabilities.json') sh "tox -e py36" } } stage('py27') { - agent { - dockerfile true - } + agent any steps { writeCapabilities(capabilities, 'capabilities.json') sh "tox -e py27" From b22d0eede9de9dd6a5577efe66ad8b22f213a644 Mon Sep 17 00:00:00 2001 From: Stephen Donner Date: Fri, 14 Sep 2018 14:37:45 -0700 Subject: [PATCH 2/3] Remove 'agent any' Docker-run vestige --- Jenkinsfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2a33448..cbe8f05 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,6 @@ pipeline { } stages { stage('Lint') { - agent any steps { sh "tox -e flake8" } @@ -41,14 +40,12 @@ pipeline { stage('Test') { parallel { stage('py36') { - agent any steps { writeCapabilities(capabilities, 'capabilities.json') sh "tox -e py36" } } stage('py27') { - agent any steps { writeCapabilities(capabilities, 'capabilities.json') sh "tox -e py27" From 9be64c5a0eebe5585370480385e8d918695c4bd6 Mon Sep 17 00:00:00 2001 From: Stephen Donner Date: Tue, 18 Sep 2018 14:35:57 -0700 Subject: [PATCH 3/3] Remove now-unused Jenkinsfile --- Jenkinsfile | 62 ----------------------------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index cbe8f05..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env groovy - -def branch = env.BRANCH_NAME ?: 'master' - -/** Desired capabilities */ -def capabilities = [ - browserName: 'Firefox', - version: '61.0', - platform: 'Windows 10' -] - -pipeline { - agent any - libraries { - lib('fxtest@1.9') - } - triggers { - pollSCM(branch == 'master' ? 'H/5 * * * *' : '') - cron(branch == 'master' ? 'H * * * *' : '') - } - options { - ansiColor('xterm') - timestamps() - timeout(time: 30, unit: 'MINUTES') - } - environment { - PYTEST_ADDOPTS = - "--tb=short " + - "--color=yes " + - "--driver=SauceLabs " + - "--variables=capabilities.json" - SAUCELABS = credentials('SAUCELABS') - } - stages { - stage('Lint') { - steps { - sh "tox -e flake8" - } - } - stage('Test') { - parallel { - stage('py36') { - steps { - writeCapabilities(capabilities, 'capabilities.json') - sh "tox -e py36" - } - } - stage('py27') { - steps { - writeCapabilities(capabilities, 'capabilities.json') - sh "tox -e py27" - } - } - } - } - } - post { - changed { - ircNotification() - } - } -}