Skip to content

Commit 9dd56a3

Browse files
authored
[full-ci][gui-tests] update docker images (owncloud#11606)
* update images * remove unnecessary step command * build as root user * separate build options * test: fix selector * ci: use upstream images * ci: provide build_type
1 parent b0b7bd8 commit 9dd56a3

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.drone.star

+8-6
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ OC_UBUNTU = "owncloud/ubuntu:20.04"
2424
# Eventually, we have to use image built on ubuntu
2525
# Todo: update or remove the following images
2626
# https://github.com/owncloud/client/issues/10070
27-
OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-38-amd64"
28-
OC_CI_SQUISH = "owncloudci/squish:fedora-38-7.1.1-qt64x-linux64"
27+
OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-39-amd64"
28+
OC_CI_SQUISH = "owncloudci/squish:fedora-39-7.2.1-qt66x-linux64"
2929

3030
PLUGINS_GIT_ACTION = "plugins/git-action:1"
3131
PLUGINS_S3 = "plugins/s3"
@@ -188,7 +188,7 @@ def gui_test_pipeline(ctx):
188188
squish_parameters += " --tags %s" % params["tags"]
189189

190190
steps = skipIfUnchanged(ctx, "gui-tests") + \
191-
build_client(OC_CI_CLIENT_FEDORA, False)
191+
build_client(OC_CI_SQUISH, False)
192192

193193
services = testMiddlewareService(server)
194194

@@ -232,8 +232,10 @@ def gui_test_pipeline(ctx):
232232
return pipelines
233233

234234
def build_client(image = OC_CI_CLIENT, ctest = True):
235-
cmake_options = '-G"%s" -DCMAKE_C_COMPILER="%s" -DCMAKE_CXX_COMPILER="%s" -DCMAKE_BUILD_TYPE="%s"'
236-
cmake_options = cmake_options % (build_config["generator"], build_config["c_compiler"], build_config["cxx_compiler"], build_config["build_type"])
235+
cmake_options = '-G"%s" -DCMAKE_BUILD_TYPE="%s"' % (build_config["generator"], build_config["build_type"])
236+
237+
if image != OC_CI_SQUISH:
238+
cmake_options += ' -DCMAKE_C_COMPILER="%s" -DCMAKE_CXX_COMPILER="%s"' % (build_config["c_compiler"], build_config["cxx_compiler"])
237239

238240
if ctest:
239241
cmake_options += " -DBUILD_TESTING=ON"
@@ -247,8 +249,8 @@ def build_client(image = OC_CI_CLIENT, ctest = True):
247249
"environment": {
248250
"LC_ALL": "C.UTF-8",
249251
},
252+
"user": "0:0",
250253
"commands": [
251-
"git submodule update --init --recursive",
252254
"mkdir -p %s" % dir["build"],
253255
"cd %s" % dir["build"],
254256
# generate build files

test/gui/shared/scripts/pageObjects/SyncConnectionWizard.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ class SyncConnectionWizard:
7171
"visible": 1,
7272
}
7373
SPACE_NAME_SELECTOR = {
74-
"column": 2,
75-
"container": names.add_Folder_Sync_Connection_tableView_QTableView,
76-
"type": "QModelIndex",
74+
"container": names.quickWidget_scrollView_ScrollView,
75+
"type": "Label",
76+
"visible": True,
7777
}
7878

7979
@staticmethod

0 commit comments

Comments
 (0)