Skip to content

[Tests-Only] allow acceptance testing against fed server from PR branch#37838

Merged
phil-davis merged 1 commit intomasterfrom
allow-acceptance-testing-against-fed-server-from-PR
Aug 24, 2020
Merged

[Tests-Only] allow acceptance testing against fed server from PR branch#37838
phil-davis merged 1 commit intomasterfrom
allow-acceptance-testing-against-fed-server-from-PR

Conversation

@phil-davis
Copy link
Copy Markdown
Contributor

@phil-davis phil-davis commented Aug 24, 2020

Description

We currently use the daily-master-qa tarball to install a federated server for acceptance tests. But it sometimes happens that the PR being tested has fixes that are needed on both the "local" and "remote" (federated) servers.

Adjust .drone.star so that both the "local" and "remote" servers-under-test can run the code from the PR. An entry "git" in federatedServerVersions means to install the federated server from git (rather than from some existing release tarball), and to use the branch of the current PR.

In drone starlark, ctx.build.source has the branch of the current PR.

How Has This Been Tested?

CI

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:
  • Changelog item, see TEMPLATE

@phil-davis phil-davis self-assigned this Aug 24, 2020
@phil-davis phil-davis force-pushed the allow-acceptance-testing-against-fed-server-from-PR branch from 3baee44 to 4dacc61 Compare August 24, 2020 04:34
@phil-davis phil-davis changed the title [Tests-Only] allow acceptance testing against fed server ffrom PR branch [Tests-Only] allow acceptance testing against fed server from PR branch Aug 24, 2020
@codecov
Copy link
Copy Markdown

codecov bot commented Aug 24, 2020

Codecov Report

Merging #37838 into master will increase coverage by 17.01%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff              @@
##             master   #37838       +/-   ##
=============================================
+ Coverage     47.74%   64.75%   +17.01%     
- Complexity        0    19392    +19392     
=============================================
  Files           111     1284     +1173     
  Lines         10971    75755    +64784     
  Branches       1333     1333               
=============================================
+ Hits           5238    49057    +43819     
- Misses         5341    26306    +20965     
  Partials        392      392               
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.94% <ø> (+31.93%) 19392.00 <ø> (+19392.00)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
...ivate/IntegrityCheck/Helpers/EnvironmentHelper.php 100.00% <0.00%> (ø) 2.00% <0.00%> (?%)
lib/private/Files/Node/AbstractFile.php 100.00% <0.00%> (ø) 6.00% <0.00%> (?%)
lib/private/User/User.php 88.88% <0.00%> (ø) 73.00% <0.00%> (?%)
lib/private/Session/Memory.php 86.95% <0.00%> (ø) 11.00% <0.00%> (?%)
settings/routes.php 100.00% <0.00%> (ø) 0.00% <0.00%> (?%)
lib/private/Files/Cache/Watcher.php 97.22% <0.00%> (ø) 19.00% <0.00%> (?%)
lib/private/Files/Storage/Wrapper/Jail.php 76.27% <0.00%> (ø) 55.00% <0.00%> (?%)
core/Command/Db/ConvertMysqlToMB4.php 0.00% <0.00%> (ø) 5.00% <0.00%> (?%)
...s/dav/appinfo/Migrations/Version20170116150538.php 0.00% <0.00%> (ø) 21.00% <0.00%> (?%)
lib/private/AvatarManager.php 100.00% <0.00%> (ø) 6.00% <0.00%> (?%)
... and 1164 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7c60e4d...f74d089. Read the comment docs.

@phil-davis phil-davis force-pushed the allow-acceptance-testing-against-fed-server-from-PR branch from 758a98d to b89f799 Compare August 24, 2020 07:10
@phil-davis phil-davis force-pushed the allow-acceptance-testing-against-fed-server-from-PR branch from b89f799 to 5ff7e7d Compare August 24, 2020 07:32
@phil-davis phil-davis force-pushed the allow-acceptance-testing-against-fed-server-from-PR branch 2 times, most recently from 80c965c to f74d089 Compare August 24, 2020 11:29
@phil-davis
Copy link
Copy Markdown
Contributor Author

https://drone.owncloud.com/owncloud/core/26514/87/11

$ git init
Initialized empty Git repository in /tmp/owncloud/.git/
$ git remote add origin https://github.com/owncloud/core.git
$ git fetch --depth 1 --no-tags origin allow-acceptance-testing-against-fed-server-from-PR
From https://github.com/owncloud/core
 * branch              allow-acceptance-testing-against-fed-server-from-PR -> FETCH_HEAD
 * [new branch]        allow-acceptance-testing-against-fed-server-from-PR -> origin/allow-acceptance-testing-against-fed-server-from-PR
$ git checkout allow-acceptance-testing-against-fed-server-from-PR
Switched to a new branch 'allow-acceptance-testing-against-fed-server-from-PR'
Branch 'allow-acceptance-testing-against-fed-server-from-PR' set up to track remote branch 'allow-acceptance-testing-against-fed-server-from-PR' from 'origin'.
$ git submodule update --init
$ git log --format=oneline -n 1
f74d089b7107450f26994a2c5616aae3abd0e40d Allow federated server to be installed from git core branch

Looks good - it pulls the PR branch in then installs ownCloud in the federated server.

@phil-davis phil-davis marked this pull request as ready for review August 24, 2020 11:56
@phil-davis phil-davis force-pushed the allow-acceptance-testing-against-fed-server-from-PR branch from f74d089 to 3b692fd Compare August 24, 2020 12:46
@phil-davis phil-davis merged commit fbb98f3 into master Aug 24, 2020
@phil-davis phil-davis deleted the allow-acceptance-testing-against-fed-server-from-PR branch August 24, 2020 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants