Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parallel deployment sharing #3052

Merged
merged 13 commits into from
Feb 1, 2022
Merged

Parallel deployment sharing #3052

merged 13 commits into from
Feb 1, 2022

Conversation

wkloucek
Copy link
Contributor

@wkloucek wkloucek commented Jan 28, 2022

Description

re enables ocis / oc10 parallel deployment tests in CI and updates the deployment example.

It includes:

  • fix the parallel deployment after it was broken because of the switch to REVA edge and spaces
  • add the sharing functionality so that shares are shared between oCIS and oC10 🥳

Related Issue

@update-docs
Copy link

update-docs bot commented Jan 28, 2022

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@wkloucek wkloucek force-pushed the parallel-deployment-sharing branch from fcd7870 to 41cc517 Compare January 31, 2022 09:01
@wkloucek wkloucek force-pushed the parallel-deployment-sharing branch from 41cc517 to 429f7a3 Compare January 31, 2022 09:15
@ownclouders
Copy link
Contributor

ownclouders commented Jan 31, 2022

💥 Acceptance test settingsUITests failed. Further test are cancelled...

@wkloucek wkloucek force-pushed the parallel-deployment-sharing branch from 21d59d1 to cf8b8b9 Compare January 31, 2022 11:26
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@wkloucek wkloucek marked this pull request as ready for review January 31, 2022 12:08
@wkloucek wkloucek requested a review from saw-jan January 31, 2022 12:08
@wkloucek
Copy link
Contributor Author

@saw-jan @phil-davis I also enabled the sharing test suite because sharing across oC10 and oCIS should basicall work, but the test fails https://drone.owncloud.com/owncloud/ocis/9048/36/15:

Feature: sharing files and folders
  As a user
  I want to share files/folders with other users
  So that I can give access to my files/folders to others

  Background:                                                                                   # /drone/src/tests/parallelDeployAcceptance/features/apiShareManagement/acceptShares.feature:11
    Given using "oc10" as owncloud selector                                                     # ParallelContext::usingOwncloudSelector()
    And the administrator has set the default folder for received shares to "Shares"            # OccContext::theAdministratorHasSetTheDefaultFolderForReceivedSharesTo()
    And auto-accept shares has been disabled                                                    # FeatureContext::autoAcceptSharesHasBeenDisabled()
    And using OCS API version "1"                                                               # FeatureContext::usingOcsApiVersion()
    And using new DAV path                                                                      # FeatureContext::usingOldOrNewDavPath()
    And user "Alice" has been created with default attributes and without skeleton files        # FeatureContext::userHasBeenCreatedWithDefaultAttributesAndWithoutSkeletonFiles()
    And user "Brian" has been created with default attributes and without skeleton files        # FeatureContext::userHasBeenCreatedWithDefaultAttributesAndWithoutSkeletonFiles()
    And user "Alice" has uploaded file with content "ownCloud test text file" to "textfile.txt" # FeatureContext::userHasUploadedAFileWithContentTo()

  Scenario: accept a pending share                                                                # /drone/src/tests/parallelDeployAcceptance/features/apiShareManagement/acceptShares.feature:22
    Given user "Alice" has shared folder "/textfile.txt" with user "Brian"                        # FeatureContext::userHasSharedFileWithUserUsingTheSharingApi()
    And using "ocis" as owncloud selector                                                         # ParallelContext::usingOwncloudSelector()
    When user "Brian" accepts share "/textfile.txt" offered by user "Alice" using the sharing API # FeatureContext::userReactsToShareOfferedBy()
      Sharing::userReactsToShareOfferedBy could not find share /textfile.txt, offered by Alice to Brian
      Failed asserting that null is not null.
    Then the OCS status code should be "100"                                                      # OCSContext::theOCSStatusCodeShouldBe()
    And the HTTP status code should be "200"                                                      # FeatureContext::thenTheHTTPStatusCodeShouldBe()
    And the sharing API should report to user "Brian" that these shares are in the accepted state # FeatureContext::assertSharesOfUserAreInState()
      | path                 |
      | /Shares/textfile.txt |

@phil-davis
Copy link
Contributor

https://drone.owncloud.com/owncloud/ocis/9048/37/15
"23 scenarios (23 passed)" - that's great.

For sharing, apiShareManagement/acceptShares.feature:22 was already in tests/parallelDeployAcceptance/expected-failures-API.md so we could look into that after merging this PR.

Copy link
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - I did a full-ci run with this code rebased to current master in draft PR #3067 and that confirms that the full-ci functionality is still working OK with these drone changes.

@wkloucek wkloucek merged commit 8ebe1c7 into master Feb 1, 2022
@delete-merged-branch delete-merged-branch bot deleted the parallel-deployment-sharing branch February 1, 2022 07:52
@wkloucek
Copy link
Contributor Author

wkloucek commented Feb 1, 2022

LGTM - I did a full-ci run with this code rebased to current master in draft PR #3067 and that confirms that the full-ci functionality is still working OK with these drone changes.

Thanks for looking into this!

For sharing, apiShareManagement/acceptShares.feature:22 was already in tests/parallelDeployAcceptance/expected-failures-API.md so we could look into that after merging this PR.

Sharing wasn't implemented before this PR, therefore I expected that that I can remove the test from the expected failure file. I'll link to #2387 to track further progress

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants