diff --git a/README.md b/README.md index a08b5d6..6bea969 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,7 @@ Jenkins job запускают Docker не через сокет хоста, а - `BRANCH=master` - `DB_URL=jdbc:postgresql://sql.otus.kartushin.su:5432/wishlist` - `DB_USER=student` +- `APPIUM_URL=http://docker:4723` Обязательно заполнить: - `DB_PASSWORD` diff --git a/jobs/mobile-appium-tests.xml b/jobs/mobile-appium-tests.xml index 197f691..99e34e1 100644 --- a/jobs/mobile-appium-tests.xml +++ b/jobs/mobile-appium-tests.xml @@ -35,6 +35,12 @@ student true + + APPIUM_URL + Appium server URL + http://docker:4723 + true + DB_PASSWORD DB password @@ -55,6 +61,7 @@ pipeline { string(name: 'APP_URL', defaultValue: '', description: 'APK URL (optional)') string(name: 'DB_URL', defaultValue: 'jdbc:postgresql://sql.otus.kartushin.su:5432/wishlist', description: 'JDBC url') string(name: 'DB_USER', defaultValue: 'student', description: 'DB user') + string(name: 'APPIUM_URL', defaultValue: 'http://docker:4723', description: 'Appium server URL') password(name: 'DB_PASSWORD', defaultValue: '', description: 'DB password') } stages { @@ -95,9 +102,9 @@ pipeline { script { def mvn = isUnix() ? 'mvn' : 'mvn.cmd' if (isUnix()) { - sh "DB_URL='${params.DB_URL}' DB_USER='${params.DB_USER}' DB_PASSWORD='${params.DB_PASSWORD}' ${mvn} -Dallure.results.directory=target/allure-results test" + sh "DB_URL='${params.DB_URL}' DB_USER='${params.DB_USER}' DB_PASSWORD='${params.DB_PASSWORD}' ${mvn} -Dappium.url=${params.APPIUM_URL} -Dallure.results.directory=target/allure-results test" } else { - bat "set DB_URL=${params.DB_URL}&& set DB_USER=${params.DB_USER}&& set DB_PASSWORD=${params.DB_PASSWORD}&& ${mvn} -Dallure.results.directory=target/allure-results test" + bat "set DB_URL=${params.DB_URL}&& set DB_USER=${params.DB_USER}&& set DB_PASSWORD=${params.DB_PASSWORD}&& ${mvn} -Dappium.url=${params.APPIUM_URL} -Dallure.results.directory=target/allure-results test" } } }