Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: [ANDROAPP-6713] add tablet on landscape for instrumentation testing #3926

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

ci: [ANDROAPP-6713] add tablet on landscape for instrumentation testing #3926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
130c8fe
ci: [ANDROAPP-6713] add tablet on landscape for instrumentation testing
andresmr Dec 11, 2024
ffadd59
ci: [ANDROAPP-6713] add tablet on landscape for instrumentation testing
andresmr Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 14 additions & 96 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,6 @@ pipeline {
}
}
}
stage('Lint Check') {
steps {
script {
echo 'Running Ktlint'
sh './gradlew ktlintCheck'
}
}
}
stage('Unit tests') {
environment {
ANDROID_HOME = '/opt/android-sdk'
}
steps {
script {
echo 'Running unit tests on app module'
sh './gradlew :app:testDhisDebugUnitTest --stacktrace --no-daemon'
echo 'Running unit tests on all other modules'
sh './gradlew testDebugUnitTest --stacktrace --no-daemon'
}
}
}
stage('Build Test APKs') {
steps {
script {
Expand All @@ -55,84 +34,23 @@ pipeline {
}
}
}
stage('Run tests') {
parallel {
stage('Deploy and run Form Tests') {
environment {
BROWSERSTACK = credentials('android-browserstack')
form_apk = sh(returnStdout: true, script: 'find form/build/outputs -iname "*.apk" | sed -n 1p')
form_apk_path = "${env.WORKSPACE}/${form_apk}"
buildTag = "${env.GIT_BRANCH} - form"
}
steps {
dir("${env.WORKSPACE}/scripts"){
script {
echo 'Browserstack deployment and running Form module tests'
sh 'chmod +x browserstackJenkinsForm.sh'
sh './browserstackJenkinsForm.sh'
}
}
}
}
stage('Deploy compose-table module Tests') {
environment {
BROWSERSTACK = credentials('android-browserstack')
compose_table_apk = sh(returnStdout: true, script: 'find compose-table/build/outputs -iname "*.apk" | sed -n 1p')
compose_table_apk_path = "${env.WORKSPACE}/${compose_table_apk}"
buildTag = "${env.GIT_BRANCH} - table"
}
steps {
dir("${env.WORKSPACE}/scripts"){
script {
echo 'Browserstack deployment and running compose-table module tests'
sh 'chmod +x browserstackJenkinsCompose.sh'
sh './browserstackJenkinsCompose.sh'
}
}
}
}
stage('Deploy and Run UI Tests') {
environment {
BROWSERSTACK = credentials('android-browserstack')
app_apk = sh(returnStdout: true, script: 'find app/build/outputs -iname "*.apk" | sed -n 1p')
test_apk = sh(returnStdout: true, script: 'find app/build/outputs -iname "*.apk" | sed -n 2p')
app_apk_path = "${env.WORKSPACE}/${app_apk}"
test_apk_path = "${env.WORKSPACE}/${test_apk}"
buildTag = "${env.GIT_BRANCH}"
}
steps {
dir("${env.WORKSPACE}/scripts"){
script {
echo 'Browserstack deployment and running tests'
sh 'chmod +x browserstackJenkins.sh'
sh './browserstackJenkins.sh'
}
}
}
}
}
}
stage('JaCoCo report') {
steps {
script {
echo 'Running JaCoCo report on app module'
sh './gradlew jacocoReport --stacktrace --no-daemon'
}
}
}
stage('Sonarqube') {

stage('Deploy and Run UI Tests') {
environment {
GIT_BRANCH = "${env.GIT_BRANCH}"
// Jenkinsfile considers empty value ('') as null
GIT_BRANCH_DEST = "${env.CHANGE_TARGET == null ? '' : env.CHANGE_TARGET}"
PULL_REQUEST = "${env.CHANGE_ID == null ? '' : env.CHANGE_ID }"
SONAR_TOKEN = credentials('android-sonarcloud-token')
BROWSERSTACK = credentials('android-browserstack')
app_apk = sh(returnStdout: true, script: 'find app/build/outputs -iname "*.apk" | sed -n 1p')
test_apk = sh(returnStdout: true, script: 'find app/build/outputs -iname "*.apk" | sed -n 2p')
app_apk_path = "${env.WORKSPACE}/${app_apk}"
test_apk_path = "${env.WORKSPACE}/${test_apk}"
buildTag = "${env.GIT_BRANCH}"
}
steps {
script {
echo 'Running Sonarqube'
sh 'chmod +x ./scripts/sonarqube.sh'
sh './scripts/sonarqube.sh'
dir("${env.WORKSPACE}/scripts"){
script {
echo 'Browserstack deployment and running tests'
sh 'chmod +x browserstackJenkins.sh'
sh './browserstackJenkins.sh'
}
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions scripts/browserstackJenkins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ shards=$(jq -n \
json=$(jq -n \
--argjson app_url $app_url \
--argjson test_url $test_url \
--argjson devices ["$browserstack_device_list"] \
--argjson devices ["$browserstack_device_list_landscape"] \
--argjson class ["$browserstack_class"] \
--arg logs "$browserstack_device_logs" \
--arg video "$browserstack_video" \
Expand All @@ -33,7 +33,8 @@ json=$(jq -n \
--arg allowDeviceMockServer "$browserstack_allowDeviceMockServer" \
--argjson shards "$shards" \
--arg buildTag "$buildTag" \
'{devices: $devices, app: $app_url, testSuite: $test_url, class: $class, logs: $logs, video: $video, local: $loc, localIdentifier: $locId, gpsLocation: $gpsLocation, language: $language, locale: $locale, deviceLogs: $deviceLogs, allowDeviceMockServer: $allowDeviceMockServer, shards: $shards, buildTag: $buildTag}')
--arg deviceOrientation "$browserstack_deviceOrientation" \
'{devices: $devices, app: $app_url, testSuite: $test_url, class: $class, logs: $logs, video: $video, local: $loc, localIdentifier: $locId, gpsLocation: $gpsLocation, language: $language, locale: $locale, deviceLogs: $deviceLogs, allowDeviceMockServer: $allowDeviceMockServer, shards: $shards, buildTag: $buildTag, deviceOrientation: $deviceOrientation}')

test_execution_response="$(curl -X POST https://api-cloud.browserstack.com/app-automate/espresso/v2/build -d \ "$json" -H "Content-Type: application/json" -u "$BROWSERSTACK_USR:$BROWSERSTACK_PSW")"

Expand Down
4 changes: 3 additions & 1 deletion scripts/config_jenkins.init
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
build_time_average=660
polling_interval=10
browserstack_device_list="\"Samsung Galaxy S10-9.0\""
browserstack_device_list_landscape="\"Samsung Galaxy Tab S6-9.0\""
browserstack_video=true
browserstack_local=false
browserstack_gps_location="40.730610,-73.935242"
Expand All @@ -10,4 +11,5 @@ browserstack_deviceLogs=true
browserstack_number_of_parallel_executions=2
bitrise_max_parallel_builds=3
browserstack_class="\"org.dhis2.usescases.UseCaseTestsSuite\",\"org.dhis2.usescases.FlowTestsSuite\""
browserstack_allowDeviceMockServer=true
browserstack_allowDeviceMockServer=true
browserstack_deviceOrientation="landscape"
Loading