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.

Sign up for GitHub

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

Jump to bottom

Allow 10.0.x to 10.0.3 all channels, 9.1.6 to 10.0.3 at stable #139

Merged
merged 2 commits into from
Sep 28, 2017
Merged

Allow 10.0.x to 10.0.3 all channels, 9.1.6 to 10.0.3 at stable #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c60978f
Allow 10.0.x to 10.0.3 all channels, 9.1.6 to 10.0.3 at stable
VicDeo Sep 14, 2017
ccb149b
Allow 9.0.10 to 9.1 at the stable channel
VicDeo Sep 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions update-server/config/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
return [
'production' => [
'10.0' => [
'latest' => '10.0.2',
'latest' => '10.0.3',
'web' => 'https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html',
],
'9.1' => [
Expand Down Expand Up @@ -145,15 +145,25 @@
],
'stable' => [
'10.0' => [
'latest' => '10.0.2',
'latest' => '10.0.3',
'web' => 'https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html',
],
'9.1' => [
'latest' => '9.1.6',
'web' => 'https://doc.owncloud.org/server/9.1/admin_manual/maintenance/upgrade.html',
],
'9.1.6' => [
'latest' => '10.0.3',
'web' => 'https://doc.owncloud.org/server/9.1/admin_manual/maintenance/upgrade.html',
],

// START: Due do a bug in the updater we need to enforce the update order
// see https://github.com/owncloud/administration-internal/issues/19
'9.0.10' => [
'latest' => '9.1.6',
'web' => 'https://doc.owncloud.org/server/9.1/admin_manual/maintenance/upgrade.html',
],

'9.0' => [
'latest' => '9.0.10',
'web' => 'https://doc.owncloud.org/server/9.0/admin_manual/maintenance/upgrade.html',
Expand Down Expand Up @@ -211,12 +221,10 @@
'beta' => [
'10.0' => [
'latest' => '10.0.3',
'downloadUrl' => 'https://download.owncloud.org/community/testing/owncloud-10.0.3RC1.zip',
'web' => 'https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html',
],
'9.1.6' => [
'latest' => '10.0.3',
'downloadUrl' => 'https://download.owncloud.org/community/testing/owncloud-10.0.3RC1.zip',
'web' => 'https://doc.owncloud.org/server/9.1/admin_manual/maintenance/upgrade.html',
],
'9.1' => [
Expand Down Expand Up @@ -290,11 +298,11 @@
],
/* early 10.0 dailies had version 9.2.0.x */
'9.2' => [
'downloadUrl' => 'https://download.owncloud.org/community/owncloud-10.0.2.zip',
'downloadUrl' => 'https://download.owncloud.org/community/owncloud-10.0.3.zip',
'web' => 'https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html',
],
'9.1' => [
'downloadUrl' => 'https://download.owncloud.org/community/owncloud-10.0.2.zip',
'downloadUrl' => 'https://download.owncloud.org/community/owncloud-10.0.3.zip',
'web' => 'https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html',
],
'9.0' => [
Expand Down
8 changes: 4 additions & 4 deletions update-server/tests/integration/features/update.beta.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ Feature: Testing the update scenario of releases on the beta channel
##### Please always order by version number descending #####

##### Tests for 10.0.x should go below #####
Scenario: Updating an outdated ownCloud 10.0.2 on the beta channel
Scenario: Updating an outdated ownCloud 10.0.3 on the beta channel
Given There is a release with channel "beta"
And The received version is "10.0.2"
When The request is sent
Then The response is non-empty
And URL to download is "https://download.owncloud.org/community/testing/owncloud-10.0.3RC1.zip"
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.3.zip"
And URL to documentation is "https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html"

Scenario: Updating an outdated ownCloud 10.0.0 on the beta channel
Given There is a release with channel "beta"
And The received version is "10.0.0"
When The request is sent
Then The response is non-empty
And URL to download is "https://download.owncloud.org/community/testing/owncloud-10.0.3RC1.zip"
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.3.zip"
And URL to documentation is "https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html"

##### Tests for 9.1.x should go below #####
Expand All @@ -24,7 +24,7 @@ Feature: Testing the update scenario of releases on the beta channel
And The received version is "9.1.6"
When The request is sent
Then The response is non-empty
And URL to download is "https://download.owncloud.org/community/testing/owncloud-10.0.3RC1.zip"
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.3.zip"
And URL to documentation is "https://doc.owncloud.org/server/9.1/admin_manual/maintenance/upgrade.html"

Scenario: Updating an outdated ownCloud 9.1.0 on the beta channel
Expand Down
6 changes: 3 additions & 3 deletions update-server/tests/integration/features/update.daily.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Feature: Testing the update scenario of releases on the daily channel
When The request is sent
Then The response is non-empty
And Update to version "100.0.0.0" is available
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.2.zip"
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.3.zip"
And URL to documentation is "https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html"

##### Tests for 9.1.x should go below #####
Expand All @@ -39,7 +39,7 @@ Feature: Testing the update scenario of releases on the daily channel
When The request is sent
Then The response is non-empty
And Update to version "100.0.0.0" is available
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.2.zip"
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.3.zip"
And URL to documentation is "https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html"

Scenario: Updating an outdated-dated ownCloud 9.1 daily
Expand All @@ -49,7 +49,7 @@ Feature: Testing the update scenario of releases on the daily channel
When The request is sent
Then The response is non-empty
And Update to version "100.0.0.0" is available
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.2.zip"
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.3.zip"
And URL to documentation is "https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html"

Scenario: Updating an up-to-date ownCloud 9.1 daily
Expand Down
24 changes: 16 additions & 8 deletions update-server/tests/integration/features/update.production.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,31 @@ Feature: Testing the update scenario of releases on the production channel


##### Tests for 10.0.x should go below #####
Scenario: Updating an outdated ownCloud 10.0.2 on the beta channel
Scenario: Updating an outdated ownCloud 10.0.3 on the production channel
Given There is a release with channel "production"
And The received version is "10.0.2"
And The received version is "10.0.3"
When The request is sent
Then The response is empty

Scenario: Updating an outdated ownCloud 10.0.1 on the production channel
Given There is a release with channel "production"
And The received version is "10.0.1"
When The request is sent
Then The response is non-empty
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.3.zip"
And URL to documentation is "https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html"

Scenario: Updating an outdated ownCloud 10.0.0 on the beta channel
Scenario: Updating an outdated ownCloud 10.0.0 on the production channel
Given There is a release with channel "production"
And The received version is "10.0.0"
When The request is sent
Then The response is non-empty
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.2.zip"
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.3.zip"
And URL to documentation is "https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html"

##### Tests for 9.1.x should go below #####
Scenario: Updating an outdated ownCloud 9.1.0 on the stable channel
Given There is a release with channel "stable"
Scenario: Updating an outdated ownCloud 9.1.0 on the production channel
Given There is a release with channel "production"
And The received version is "9.1.6"
When The request is sent
Then The response is empty
Expand All @@ -33,8 +41,8 @@ Feature: Testing the update scenario of releases on the production channel
And URL to documentation is "https://doc.owncloud.org/server/9.1/admin_manual/maintenance/upgrade.html"

##### Tests for 9.0.x should go below #####
Scenario: Updating an outdated ownCloud 9.0.10 on the stable channel
Given There is a release with channel "stable"
Scenario: Updating an outdated ownCloud 9.0.10 on the production channel
Given There is a release with channel "production"
And The received version is "9.0.10"
When The request is sent
Then The response is empty
Expand Down
22 changes: 13 additions & 9 deletions update-server/tests/integration/features/update.stable.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,36 @@ Feature: Testing the update scenario of releases on the stable channel
##### Please always order by version number descending #####

##### Tests for 10.0.x should go below #####
Scenario: Updating an outdated ownCloud 10.0.2 on the beta channel
Scenario: Updating an outdated ownCloud 10.0.3 on the stable channel
Given There is a release with channel "stable"
And The received version is "10.0.2"
And The received version is "10.0.3"
When The request is sent
Then The response is empty

Scenario: Updating an outdated ownCloud 10.0.1 on the beta channel
Scenario: Updating an outdated ownCloud 10.0.1 on the stable channel
Given There is a release with channel "stable"
And The received version is "10.0.1"
When The request is sent
Then The response is non-empty
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.2.zip"
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.3.zip"
And URL to documentation is "https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html"

Scenario: Updating an outdated ownCloud 10.0.0 on the beta channel
Scenario: Updating an outdated ownCloud 10.0.0 on the stable channel
Given There is a release with channel "stable"
And The received version is "10.0.0"
When The request is sent
Then The response is non-empty
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.2.zip"
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.3.zip"
And URL to documentation is "https://doc.owncloud.org/server/10.0/admin_manual/maintenance/upgrade.html"

##### Tests for 9.1.x should go below #####
Scenario: Updating an outdated ownCloud 9.1.0 on the stable channel
Given There is a release with channel "stable"
And The received version is "9.1.6"
When The request is sent
Then The response is empty
Then The response is non-empty
And URL to download is "https://download.owncloud.org/community/owncloud-10.0.3.zip"
And URL to documentation is "https://doc.owncloud.org/server/9.1/admin_manual/maintenance/upgrade.html"

Scenario: Updating an outdated ownCloud 9.1.0 on the stable channel
Given There is a release with channel "stable"
Expand All @@ -44,8 +46,10 @@ Feature: Testing the update scenario of releases on the stable channel
Given There is a release with channel "stable"
And The received version is "9.0.10"
When The request is sent
Then The response is empty

Then The response is non-empty
And URL to download is "https://download.owncloud.org/community/owncloud-9.1.6.zip"
And URL to documentation is "https://doc.owncloud.org/server/9.1/admin_manual/maintenance/upgrade.html"

Scenario: Updating an outdated ownCloud 9.0.5 on the stable channel
Given There is a release with channel "stable"
And The received version is "9.0.5"
Expand Down