Skip to content

Commit ce120f7

Browse files
phil-davisphil-davis
authored
[tests-only] bump core commit id (#1290)
* bump core commit id * Use PHP 7.4 for behat acceptance test runner
1 parent a84a1ee commit ce120f7

File tree

5 files changed

+108
-92
lines changed

5 files changed

+108
-92
lines changed

‎.drone.yml

+42-42
Original file line numberDiff line numberDiff line change
@@ -441,15 +441,15 @@ steps:
441441
- /drone/src/cmd/revad/revad -c ldap-users.toml
442442

443443
- name: clone-oC10-test-repos
444-
image: owncloudci/php:7.2
444+
image: owncloudci/php:7.4
445445
commands:
446446
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
447447
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
448448
- cd /drone/src/tmp/testrunner
449-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
449+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
450450

451451
- name: localAPIAcceptanceTestsOwncloudStorage
452-
image: owncloudci/php:7.2
452+
image: owncloudci/php:7.4
453453
commands:
454454
- make test-acceptance-api
455455
environment:
@@ -516,15 +516,15 @@ steps:
516516
- /drone/src/cmd/revad/revad -c ldap-users.toml
517517

518518
- name: clone-oC10-test-repos
519-
image: owncloudci/php:7.2
519+
image: owncloudci/php:7.4
520520
commands:
521521
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
522522
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
523523
- cd /drone/src/tmp/testrunner
524-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
524+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
525525

526526
- name: localAPIAcceptanceTestsOcisStorage
527-
image: owncloudci/php:7.2
527+
image: owncloudci/php:7.4
528528
commands:
529529
- make test-acceptance-api
530530
environment:
@@ -586,15 +586,15 @@ steps:
586586
- /drone/src/cmd/revad/revad -c ldap-users.toml
587587

588588
- name: clone-oC10-test-repos
589-
image: owncloudci/php:7.2
589+
image: owncloudci/php:7.4
590590
commands:
591591
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
592592
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
593593
- cd /drone/src/tmp/testrunner
594-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
594+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
595595

596596
- name: oC10APIAcceptanceTestsOcisStorage
597-
image: owncloudci/php:7.2
597+
image: owncloudci/php:7.4
598598
commands:
599599
- cd /drone/src/tmp/testrunner
600600
- make test-acceptance-api
@@ -659,15 +659,15 @@ steps:
659659
- /drone/src/cmd/revad/revad -c ldap-users.toml
660660

661661
- name: clone-oC10-test-repos
662-
image: owncloudci/php:7.2
662+
image: owncloudci/php:7.4
663663
commands:
664664
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
665665
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
666666
- cd /drone/src/tmp/testrunner
667-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
667+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
668668

669669
- name: oC10APIAcceptanceTestsOcisStorage
670-
image: owncloudci/php:7.2
670+
image: owncloudci/php:7.4
671671
commands:
672672
- cd /drone/src/tmp/testrunner
673673
- make test-acceptance-api
@@ -732,15 +732,15 @@ steps:
732732
- /drone/src/cmd/revad/revad -c ldap-users.toml
733733

734734
- name: clone-oC10-test-repos
735-
image: owncloudci/php:7.2
735+
image: owncloudci/php:7.4
736736
commands:
737737
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
738738
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
739739
- cd /drone/src/tmp/testrunner
740-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
740+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
741741

742742
- name: oC10APIAcceptanceTestsOcisStorage
743-
image: owncloudci/php:7.2
743+
image: owncloudci/php:7.4
744744
commands:
745745
- cd /drone/src/tmp/testrunner
746746
- make test-acceptance-api
@@ -805,15 +805,15 @@ steps:
805805
- /drone/src/cmd/revad/revad -c ldap-users.toml
806806

807807
- name: clone-oC10-test-repos
808-
image: owncloudci/php:7.2
808+
image: owncloudci/php:7.4
809809
commands:
810810
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
811811
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
812812
- cd /drone/src/tmp/testrunner
813-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
813+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
814814

815815
- name: oC10APIAcceptanceTestsOcisStorage
816-
image: owncloudci/php:7.2
816+
image: owncloudci/php:7.4
817817
commands:
818818
- cd /drone/src/tmp/testrunner
819819
- make test-acceptance-api
@@ -878,15 +878,15 @@ steps:
878878
- /drone/src/cmd/revad/revad -c ldap-users.toml
879879

880880
- name: clone-oC10-test-repos
881-
image: owncloudci/php:7.2
881+
image: owncloudci/php:7.4
882882
commands:
883883
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
884884
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
885885
- cd /drone/src/tmp/testrunner
886-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
886+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
887887

888888
- name: oC10APIAcceptanceTestsOcisStorage
889-
image: owncloudci/php:7.2
889+
image: owncloudci/php:7.4
890890
commands:
891891
- cd /drone/src/tmp/testrunner
892892
- make test-acceptance-api
@@ -951,15 +951,15 @@ steps:
951951
- /drone/src/cmd/revad/revad -c ldap-users.toml
952952

953953
- name: clone-oC10-test-repos
954-
image: owncloudci/php:7.2
954+
image: owncloudci/php:7.4
955955
commands:
956956
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
957957
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
958958
- cd /drone/src/tmp/testrunner
959-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
959+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
960960

961961
- name: oC10APIAcceptanceTestsOcisStorage
962-
image: owncloudci/php:7.2
962+
image: owncloudci/php:7.4
963963
commands:
964964
- cd /drone/src/tmp/testrunner
965965
- make test-acceptance-api
@@ -1024,15 +1024,15 @@ steps:
10241024
- /drone/src/cmd/revad/revad -c ldap-users.toml
10251025

10261026
- name: clone-oC10-test-repos
1027-
image: owncloudci/php:7.2
1027+
image: owncloudci/php:7.4
10281028
commands:
10291029
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
10301030
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
10311031
- cd /drone/src/tmp/testrunner
1032-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
1032+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
10331033

10341034
- name: oC10APIAcceptanceTestsOwncloudStorage
1035-
image: owncloudci/php:7.2
1035+
image: owncloudci/php:7.4
10361036
commands:
10371037
- cd /drone/src/tmp/testrunner
10381038
- make test-acceptance-api
@@ -1102,15 +1102,15 @@ steps:
11021102
- /drone/src/cmd/revad/revad -c ldap-users.toml
11031103

11041104
- name: clone-oC10-test-repos
1105-
image: owncloudci/php:7.2
1105+
image: owncloudci/php:7.4
11061106
commands:
11071107
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
11081108
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
11091109
- cd /drone/src/tmp/testrunner
1110-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
1110+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
11111111

11121112
- name: oC10APIAcceptanceTestsOwncloudStorage
1113-
image: owncloudci/php:7.2
1113+
image: owncloudci/php:7.4
11141114
commands:
11151115
- cd /drone/src/tmp/testrunner
11161116
- make test-acceptance-api
@@ -1180,15 +1180,15 @@ steps:
11801180
- /drone/src/cmd/revad/revad -c ldap-users.toml
11811181

11821182
- name: clone-oC10-test-repos
1183-
image: owncloudci/php:7.2
1183+
image: owncloudci/php:7.4
11841184
commands:
11851185
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
11861186
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
11871187
- cd /drone/src/tmp/testrunner
1188-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
1188+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
11891189

11901190
- name: oC10APIAcceptanceTestsOwncloudStorage
1191-
image: owncloudci/php:7.2
1191+
image: owncloudci/php:7.4
11921192
commands:
11931193
- cd /drone/src/tmp/testrunner
11941194
- make test-acceptance-api
@@ -1258,15 +1258,15 @@ steps:
12581258
- /drone/src/cmd/revad/revad -c ldap-users.toml
12591259

12601260
- name: clone-oC10-test-repos
1261-
image: owncloudci/php:7.2
1261+
image: owncloudci/php:7.4
12621262
commands:
12631263
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
12641264
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
12651265
- cd /drone/src/tmp/testrunner
1266-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
1266+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
12671267

12681268
- name: oC10APIAcceptanceTestsOwncloudStorage
1269-
image: owncloudci/php:7.2
1269+
image: owncloudci/php:7.4
12701270
commands:
12711271
- cd /drone/src/tmp/testrunner
12721272
- make test-acceptance-api
@@ -1336,15 +1336,15 @@ steps:
13361336
- /drone/src/cmd/revad/revad -c ldap-users.toml
13371337

13381338
- name: clone-oC10-test-repos
1339-
image: owncloudci/php:7.2
1339+
image: owncloudci/php:7.4
13401340
commands:
13411341
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
13421342
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
13431343
- cd /drone/src/tmp/testrunner
1344-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
1344+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
13451345

13461346
- name: oC10APIAcceptanceTestsOwncloudStorage
1347-
image: owncloudci/php:7.2
1347+
image: owncloudci/php:7.4
13481348
commands:
13491349
- cd /drone/src/tmp/testrunner
13501350
- make test-acceptance-api
@@ -1414,15 +1414,15 @@ steps:
14141414
- /drone/src/cmd/revad/revad -c ldap-users.toml
14151415

14161416
- name: clone-oC10-test-repos
1417-
image: owncloudci/php:7.2
1417+
image: owncloudci/php:7.4
14181418
commands:
14191419
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
14201420
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
14211421
- cd /drone/src/tmp/testrunner
1422-
- git checkout 47365d22af95d90fcbd7705572f715a7b93d31b6
1422+
- git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160
14231423

14241424
- name: oC10APIAcceptanceTestsOwncloudStorage
1425-
image: owncloudci/php:7.2
1425+
image: owncloudci/php:7.4
14261426
commands:
14271427
- cd /drone/src/tmp/testrunner
14281428
- make test-acceptance-api

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cs3org/reva",
33
"config" : {
44
"platform": {
5-
"php": "7.2"
5+
"php": "7.4"
66
}
77
},
88
"require": {

‎tests/acceptance/expected-failures-on-OCIS-storage.txt

+32-24
Original file line numberDiff line numberDiff line change
@@ -514,26 +514,38 @@ apiSharePublicLink2/updatePublicLinkShare.feature:94
514514
apiSharePublicLink2/updatePublicLinkShare.feature:284
515515
apiSharePublicLink2/updatePublicLinkShare.feature:285
516516
#
517-
# https://github.com/owncloud/ocis/issues/776 investigate ocis issues in apiSharePublicLink2/reShareAsPublicLinkToShares
518-
#
519-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:25
520-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:26
521-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:47
522-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:48
523-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:63
524-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:64
525-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:78
526-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:79
527-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:100
528-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:101
529-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:123
530-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:124
531-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:140
532-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:141
533-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:161
534-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:162
535-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:184
536-
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:185
517+
# https://github.com/owncloud/ocis/issues/270 [OCIS] share permissions not enforced
518+
#
519+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:25
520+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:26
521+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:62
522+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:63
523+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:77
524+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:78
525+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:136
526+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:137
527+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:157
528+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:158
529+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:179
530+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:180
531+
#
532+
# https://github.com/owncloud/ocis-reva/issues/292 Public link enforce permissions
533+
#
534+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:97
535+
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:98
536+
#
537+
# https://github.com/owncloud/product/issues/272 [OCIS] old public webdav api doesnt works
538+
#
539+
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:30
540+
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:31
541+
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:50
542+
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:51
543+
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:71
544+
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:72
545+
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:92
546+
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:93
547+
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:114
548+
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:115
537549
#
538550
# https://github.com/owncloud/ocis-reva/issues/11 listing received shares does not work
539551
#
@@ -1202,10 +1214,6 @@ apiWebdavProperties2/getFileProperties.feature:327
12021214
apiWebdavProperties2/getFileProperties.feature:328
12031215
apiWebdavProperties2/getFileProperties.feature:376
12041216
apiWebdavProperties2/getFileProperties.feature:377
1205-
apiWebdavProperties2/getFileProperties.feature:389
1206-
apiWebdavProperties2/getFileProperties.feature:390
1207-
apiWebdavProperties2/getFileProperties.feature:402
1208-
apiWebdavProperties2/getFileProperties.feature:403
12091217
apiWebdavProperties2/getFileProperties.feature:415
12101218
apiWebdavProperties2/getFileProperties.feature:416
12111219
apiWebdavProperties2/getFileProperties.feature:428

0 commit comments

Comments
 (0)