From 06d5c499e835e1722eed02fe83edcaacd82db520 Mon Sep 17 00:00:00 2001 From: "James J. Ye" Date: Mon, 15 Oct 2018 21:13:27 +0800 Subject: [PATCH 1/2] use existing env.list instead of copying over Keeping the env.list in the source code as a template. On the server side, keep/app/env.list between builds to avoid broken build in Jennkins --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4162c6f2..c441ecff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,8 +32,8 @@ pipeline { stage("Deploy to staging") { steps { - sh "ssh ${JENKINS_AT_STAGING} rm -fr /app/env.list /app/start.sh" - sh "scp ./docker/env.list ./docker/start.sh ${JENKINS_AT_STAGING}:/app" + sh "ssh ${JENKINS_AT_STAGING} rm -fr /app/start.sh" + sh "scp ./docker/start.sh ${JENKINS_AT_STAGING}:/app" sh "ssh ${JENKINS_AT_STAGING} \"cd /app && ./start.sh ${env.GIT_COMMIT}\"" } } From 057a8fc2139b0ad7c1396ba7c4af8743d54180b5 Mon Sep 17 00:00:00 2001 From: "James J. Ye" Date: Mon, 15 Oct 2018 21:14:27 +0800 Subject: [PATCH 2/2] increase the wait time for local remote e2e testing Once the Jenkins server is also deployed to AWS at https://ci.taskagile.com, the wait time will be decreased --- front-end/tests/e2e/specs/0.register.e2e.js | 2 +- front-end/tests/e2e/specs/1.login.e2e.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/front-end/tests/e2e/specs/0.register.e2e.js b/front-end/tests/e2e/specs/0.register.e2e.js index ec603af7..eda4ea5b 100644 --- a/front-end/tests/e2e/specs/0.register.e2e.js +++ b/front-end/tests/e2e/specs/0.register.e2e.js @@ -29,7 +29,7 @@ module.exports = { registerPage .navigate() - .waitForElementVisible('@app', 500) + .waitForElementVisible('@app', 30000) .assert.visible('@usernameInput') .assert.visible('@emailAddressInput') .assert.visible('@firstNameInput') diff --git a/front-end/tests/e2e/specs/1.login.e2e.js b/front-end/tests/e2e/specs/1.login.e2e.js index f715868d..c020bbf3 100644 --- a/front-end/tests/e2e/specs/1.login.e2e.js +++ b/front-end/tests/e2e/specs/1.login.e2e.js @@ -6,7 +6,7 @@ module.exports = { loginPage .navigate() - .waitForElementVisible('@app', 500) + .waitForElementVisible('@app', 30000) .assert.visible('@usernameInput') .assert.visible('@passwordInput') .assert.visible('@submitButton') @@ -20,7 +20,7 @@ module.exports = { .navigate() .login('not-exist', 'incorrect') - browser.pause(500) + browser.pause(2000) loginPage .assert.visible('@formError')