ci: fixes for AUT_PATH and change compression to 7z

Author: markoburcul

ci/Jenkinsfile.tests-e2e.windows

@@ -133,7 +133,7 @@ pipeline {
         fileOperations([
           fileDownloadOperation(
             url:            params.BUILD_SOURCE,
-            targetFileName: 'StatusIm-Desktop.tar.gz',
+            targetFileName: 'StatusIm-Desktop.7z',
             targetLocation: './pkg/',
             userName:       '',
             password:       '',
@@ -147,55 +147,53 @@ pipeline {
       steps { timeout(5) { script { dir('test/e2e') {
         copyArtifacts(
           projectName: params.BUILD_SOURCE,
-          filter:      'pkg/*-x86_64.tar.gz',
+          filter:      'pkg/*-x86_64.7z',
           selector:    lastWithArtifacts(),
           target:      './'
         )
-        setBuildDescFromFile(utils.findFile('pkg/*tar.gz'))
+        setBuildDescFromFile(utils.findFile('pkg/*7z'))
       } } } }
     }
 
     stage('Unpack') {
       steps { timeout(5) { script { dir('test/e2e') {
         sh 'mkdir aut'
-        sh "tar -zxvf '${utils.findFile('pkg/*tar.gz')}' -C './aut'"
-        env.AUT_PATH = utils.findFile('aut/*.AppImage')
+        sh "7z x '${utils.findFile('pkg/*tar.gz')}' -o'./aut'"
+        env.AUT_PATH = utils.findFile('aut/Status/*.exe').replace('\\','/')
       } } } }
     }
 
     stage('Test') {
-      steps { timeout(getTestStageTimeout()) { script { dir('test/e2e') {
-        def flags = []
-        if (params.TEST_NAME)  { flags.add("-k=${params.TEST_NAME}") }
-        if (params.TEST_SCOPE_FLAG) { flags.add(params.TEST_SCOPE_FLAG) }
-        if (params.LOG_LEVEL)  { flags.addAll(["--log-level=${params.LOG_LEVEL}", "--log-cli-level=${params.LOG_LEVEL}"]) }
-        dir ('configs') { sh 'ln -s _local.ci.py _local.py' }
-        wrap([
-          $class:            'Xvfb',
-          autoDisplayName:   true,
-          parallelBuild:     true,
-          screen:            '2560x1440x24',
-          additionalOptions: '-dpi 1'
-        ]) {
-          sh 'fluxbox &'
-          withCredentials([
-            usernamePassword(
-              credentialsId: 'test-rail-api-devops',
-              usernameVariable: 'TESTRAIL_USR',
-              passwordVariable: 'TESTRAIL_PSW'
-            ),
-            string(credentialsId: 'wallet-test-user-seed', variable: 'WALLET_TEST_USER_SEED')
-          ]) {
-            /* Keep the --reruns flag first, or it won't work */
-            sh """
-              python310 -m pytest -m "not keycard" -v --reruns=1 --timeout=300 ${flags.join(" ")} \
-                --disable-warnings \
-                --alluredir=./allure-results \
-                -o timeout_func_only=true
-            """
+      steps {
+        timeout(time: getTestStageTimeout()) {
+          dir('test/e2e') {
+            script {
+              def flags = []
+              if (params.TEST_NAME)       { flags.add("-k=${params.TEST_NAME}") }
+              if (params.TEST_SCOPE_FLAG) { flags.add(params.TEST_SCOPE_FLAG) }
+              if (params.LOG_LEVEL)       { flags.addAll(["--log-level=${params.LOG_LEVEL}", "--log-cli-level=${params.LOG_LEVEL}"]) }
+              def flagStr = flags.join(' ')
+
+              withCredentials([
+                usernamePassword(credentialsId: 'test-rail-api-devops', usernameVariable: 'TESTRAIL_USR', passwordVariable: 'TESTRAIL_PSW'),
+                string(credentialsId: 'wallet-test-user-seed', variable: 'WALLET_TEST_USER_SEED')
+              ]) {
+                sh"""
+                  pushd configs
+                  ln -sf _local.ci.py _local.py || cp _local.ci.py _local.py
+                  popd
+
+                  # Run tests
+                  ${VIRTUAL_ENV}\\Scripts\\python.exe -m pytest -m "not keycard" -v --reruns=1 --timeout=300 ${flagStr} `
+                    --disable-warnings `
+                    --alluredir=./allure-results `
+                    -o timeout_func_only=true
+                """
+              }
+            }
           }
         }
-      } } } }
+      }
     }
   }
 

test/e2e/configs/__init__.py

@@ -19,8 +19,8 @@
 
 if AUT_PATH is None:
     exit('Please add "AUT_PATH" in ./configs/_local.py')
-if get_platform() == "Windows" and 'bin' not in AUT_PATH:
-    exit('Please use launcher from "bin" folder in "AUT_PATH"')
+if get_platform() == "Windows" and 'Status' not in AUT_PATH:
+    exit('Please use launcher from "Status" folder in "AUT_PATH"')
 AUT_PATH = SystemPath(AUT_PATH)
 WALLET_SEED = os.getenv('WALLET_TEST_USER_SEED')