diff --git a/.drone.star b/.drone.star index 058ec68f0df..3274d1cd16f 100644 --- a/.drone.star +++ b/.drone.star @@ -24,8 +24,8 @@ OC_UBUNTU = "owncloud/ubuntu:20.04" # Eventually, we have to use image built on ubuntu # Todo: update or remove the following images # https://github.com/owncloud/client/issues/10070 -OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-38-amd64" -OC_CI_SQUISH = "owncloudci/squish:fedora-38-7.1.1-qt64x-linux64" +OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-39-amd64" +OC_CI_SQUISH = "owncloudci/squish:fedora-39-7.2.1-qt66x-linux64" PLUGINS_GIT_ACTION = "plugins/git-action:1" PLUGINS_S3 = "plugins/s3" @@ -188,7 +188,7 @@ def gui_test_pipeline(ctx): squish_parameters += " --tags %s" % params["tags"] steps = skipIfUnchanged(ctx, "gui-tests") + \ - build_client(OC_CI_CLIENT_FEDORA, False) + build_client(OC_CI_SQUISH, False) services = testMiddlewareService(server) @@ -232,8 +232,10 @@ def gui_test_pipeline(ctx): return pipelines def build_client(image = OC_CI_CLIENT, ctest = True): - cmake_options = '-G"%s" -DCMAKE_C_COMPILER="%s" -DCMAKE_CXX_COMPILER="%s" -DCMAKE_BUILD_TYPE="%s"' - cmake_options = cmake_options % (build_config["generator"], build_config["c_compiler"], build_config["cxx_compiler"], build_config["build_type"]) + cmake_options = '-G"%s" -DCMAKE_BUILD_TYPE="%s"' % (build_config["generator"], build_config["build_type"]) + + if image != OC_CI_SQUISH: + cmake_options += ' -DCMAKE_C_COMPILER="%s" -DCMAKE_CXX_COMPILER="%s"' % (build_config["c_compiler"], build_config["cxx_compiler"]) if ctest: cmake_options += " -DBUILD_TESTING=ON" @@ -247,8 +249,8 @@ def build_client(image = OC_CI_CLIENT, ctest = True): "environment": { "LC_ALL": "C.UTF-8", }, + "user": "0:0", "commands": [ - "git submodule update --init --recursive", "mkdir -p %s" % dir["build"], "cd %s" % dir["build"], # generate build files diff --git a/test/gui/shared/scripts/pageObjects/SyncConnectionWizard.py b/test/gui/shared/scripts/pageObjects/SyncConnectionWizard.py index 14c2edb11a7..2469813922a 100644 --- a/test/gui/shared/scripts/pageObjects/SyncConnectionWizard.py +++ b/test/gui/shared/scripts/pageObjects/SyncConnectionWizard.py @@ -71,9 +71,9 @@ class SyncConnectionWizard: "visible": 1, } SPACE_NAME_SELECTOR = { - "column": 2, - "container": names.add_Folder_Sync_Connection_tableView_QTableView, - "type": "QModelIndex", + "container": names.quickWidget_scrollView_ScrollView, + "type": "Label", + "visible": True, } @staticmethod