From 6c39afccc98feb49ef884b9a6f371d66a5848b06 Mon Sep 17 00:00:00 2001
From: Quentin Monnier <quentin.monnier38@gmail.com>
Date: Thu, 8 Dec 2022 00:50:03 -0500
Subject: [PATCH] update gitlab ci

---
 .gitlab-ci-files/job-uitests.yml                      | 11 +++++++----
 .../java/org/linphone/call/IncomingCallPushUITests.kt |  2 ++
 .../java/org/linphone/call/IncomingCallUITests.kt     |  2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci-files/job-uitests.yml b/.gitlab-ci-files/job-uitests.yml
index 81449c19e..12c2b2197 100644
--- a/.gitlab-ci-files/job-uitests.yml
+++ b/.gitlab-ci-files/job-uitests.yml
@@ -18,6 +18,7 @@ job-android-uitests:
 
   stage: uitests
   tags: [ "macos-xcode13" ]
+  allow_failure: true
 
   dependencies:
     - job-android
@@ -33,22 +34,24 @@ job-android-uitests:
     - ${ANDROID_HOME}/platform-tools/adb logcat -d > logs/logcats.log
 
   script:
-    - ./gradlew -Pandroid.testInstrumentationRunnerArguments.class=org.linphone.testsuites.CallTestSuite -PscreportAutoClose=true connectedAndroidTest --continue > logs/build.log
+    - ./gradlew -Pandroid.testInstrumentationRunnerArguments.class=org.linphone.testsuites.CallTestSuite -PscreportAutoClose=true connectedAndroidTest --continue
     - ${ANDROID_HOME}/platform-tools/adb -s emulator-5554 emu kill
     - ${ANDROID_HOME}/platform-tools/adb -s emulator-5554 emu kill
     - ${ANDROID_HOME}/platform-tools/adb kill-server
 
   after_script:
     - mv app/build/reports/androidTests/connected/* reports
-	- mv app/build/outputs/apk/debug/linphone-android-debug-*.apk ./apks/debug
-    - mv app/build/outputs/apk/release/linphone-android-release-*.apk ./apks/release
+	- mv app/build/outputs/apk/debug ./apks
+    - mv app/build/outputs/apk/release ./apks
+    - python3 --version
     - python3 .gitlab-ci-files/html2xml-report.py -p reports
     
   artifacts:
     paths:
       - reports/*
       - logs/*
-      - apks/*
+      - apks/debug/linphone-android-debug-*.apk
+      - apks/release/linphone-android-release-*.apk
     when: always
     reports:
       junit:
diff --git a/app/src/androidTest/java/org/linphone/call/IncomingCallPushUITests.kt b/app/src/androidTest/java/org/linphone/call/IncomingCallPushUITests.kt
index 750508508..101308de7 100644
--- a/app/src/androidTest/java/org/linphone/call/IncomingCallPushUITests.kt
+++ b/app/src/androidTest/java/org/linphone/call/IncomingCallPushUITests.kt
@@ -3,6 +3,7 @@ package org.linphone.call
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
 import androidx.test.rule.GrantPermissionRule
 import java.util.*
 import org.junit.After
@@ -16,6 +17,7 @@ import org.linphone.methods.UITestsScreenshots.takeScreenshot
 import org.linphone.utils.AppUtils.Companion.getString
 
 @RunWith(AndroidJUnit4::class)
+@LargeTest
 class IncomingCallPushUITests {
 
     val methods = CallViewUITestsMethods
diff --git a/app/src/androidTest/java/org/linphone/call/IncomingCallUITests.kt b/app/src/androidTest/java/org/linphone/call/IncomingCallUITests.kt
index 55125a648..cec5a7a56 100644
--- a/app/src/androidTest/java/org/linphone/call/IncomingCallUITests.kt
+++ b/app/src/androidTest/java/org/linphone/call/IncomingCallUITests.kt
@@ -4,6 +4,7 @@ import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
 import androidx.test.rule.GrantPermissionRule
 import org.junit.After
 import org.junit.Before
@@ -17,6 +18,7 @@ import org.linphone.methods.UITestsUtils.checkWithTimeout
 import org.linphone.utils.AppUtils.Companion.getString
 
 @RunWith(AndroidJUnit4::class)
+@LargeTest
 class IncomingCallUITests {
 
     val methods = CallViewUITestsMethods