From 9eb3098e9bbea46cf8e4fa9b00409ae428e18037 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 23 Mar 2021 10:43:41 +0100 Subject: [PATCH] Change stable16 tests to stable21 Signed-off-by: Morris Jobke --- .drone.yml | 42 +++++++++++++++------ Makefile | 4 +- tests/features/bootstrap/FeatureContext.php | 21 ----------- tests/features/stable16.feature | 23 ----------- tests/features/stable21.feature | 10 +++++ 5 files changed, 42 insertions(+), 58 deletions(-) delete mode 100644 tests/features/stable16.feature create mode 100644 tests/features/stable21.feature diff --git a/.drone.yml b/.drone.yml index 900522b7..44cc6a40 100644 --- a/.drone.yml +++ b/.drone.yml @@ -161,13 +161,13 @@ trigger: --- kind: pipeline -name: php71-stable16 +name: php73-stable21 steps: - - name: php71-stable16 - image: nextcloudci/php7.1:php7.1-16 + - name: php73-stable21 + image: nextcloudci/php7.3:php7.3-5 commands: - - make test-stable16 + - make test-stable21 trigger: branch: @@ -179,13 +179,13 @@ trigger: --- kind: pipeline -name: php72-stable16 +name: php74-stable21 steps: - - name: php72-stable16 - image: nextcloudci/php7.2:php7.2-12 + - name: php74-stable21 + image: nextcloudci/php7.4:php7.4-3 commands: - - make test-stable16 + - make test-stable21 trigger: branch: @@ -197,13 +197,13 @@ trigger: --- kind: pipeline -name: php73-stable16 +name: php80-stable21 steps: - - name: php73-stable16 - image: nextcloudci/php7.3:php7.3-2 + - name: php80-stable21 + image: nextcloudci/php8.0:php8.0-1 commands: - - make test-stable16 + - make test-stable21 trigger: branch: @@ -247,3 +247,21 @@ trigger: event: - pull_request - push + +--- +kind: pipeline +name: php80-master + +steps: + - name: php80-master + image: nextcloudci/php8.0:php8.0-1 + commands: + - make test-master + +trigger: + branch: + - master + - stable* + event: + - pull_request + - push diff --git a/Makefile b/Makefile index 30bd65d6..7b9e88f2 100644 --- a/Makefile +++ b/Makefile @@ -29,8 +29,8 @@ test-stable19: updater.phar test/vendor test-stable20: updater.phar test/vendor cd tests && vendor/behat/behat/bin/behat features/stable20.feature -test-stable16: updater.phar test/vendor - cd tests && vendor/behat/behat/bin/behat features/stable16.feature +test-stable21: updater.phar test/vendor + cd tests && vendor/behat/behat/bin/behat features/stable21.feature test-master: updater.phar test/vendor cd tests && vendor/behat/behat/bin/behat features/master.feature diff --git a/tests/features/bootstrap/FeatureContext.php b/tests/features/bootstrap/FeatureContext.php index fd92575d..1d14b7d6 100644 --- a/tests/features/bootstrap/FeatureContext.php +++ b/tests/features/bootstrap/FeatureContext.php @@ -196,27 +196,6 @@ public function theCliUpdaterIsRun() */ public function getSignatureForVersion($version) { $signatures = [ - '15.0.0RC1' => 'AQK4hJcQ1TZAPOpMfVy4ukOp6ny1DyzBY5ui7P9WhgBMHLeP4ed9Apmc07gcCOJF -Ya/+Bfc/ESNtVVeZQ3r9ubSz0NTTBgXDO7N7ymSCgA5wq4wqgjHW+bKZfDHoxt+1 -WbRmf4trGwDdCA/kQ59LInfLR8KFfEiiOH2p2NijgXuWm49tdr7N1062diP4Dzwd -WlWfRoT8G5DDQPGdj5a72+sQLjf3ZhjqgeQbGLwht/NonWLZhmmW/NgmylbCb9Ob -a7NE4Vf792DrmBvq4HCHUexg+upaJ0s4sJLGqg3sWF8iUEnLyGePyL/Bw6MeLvjD -sSD0Xb5oawIjTVHVAuL+3Q==', - '15.0.10' => '1FcyXT8cgPMctfn+S5QLGbPrkeXEWyaIGh1T9mP7BHaF5AHamuAGDzk04FKHYB/e -OylmXzDBE2w1LG5AOABAw3idwIJpfvH2dyi8tsBNdcGKY01DmMYEzn4y5i2r5Duv -lRjhRfuk/MrjUOH1XkGO1xPI8zXp8eI7Y53jHswbUayJGszzgCKcuC6z+QEUkf7v -p15duG8nbbF1c3CAh/dVsJ2AKKpcnLYJPC8UgGDXMtalSoPUv9QTWPrS7AqQRsVD -7xJThvWdx3aSV3aKREBzw5ddHUAIEENQ0aBdabgAXbBZEfLrMMG2XaHtdXGLpQs8 -ypwcWVvLfYk9e+YEMdhMNg==', - '16.0.3' => 'TYiUB/+l2uXNpiHGuMhchHzzyMn8eiL2mzBD+fmwqUXU29UYK4FFvTbDEWWXxXF9 -XeOXXBTkWltQ6A5K+nwFx4Phf4VPznaGn3U/1hsLSLBy9p9qqBMQdmDvCxl4dJmP -R0Ttz6sGcC1AsYwW2Q5Z1lywpmk1Ax5YcJesbjOFTU9HXIOI2s9YyPX4bP3L1rkH -CaZqjW7yCedKhj64F/SuXnUwaPhqTNNoDdhCN14IKvXCFYKLxm5UoGXrddwIcRrL -rHSv7h5818aTjmj4sB1jsVrxNf32PgrUED8PUqgMYx1FxEzGyct4yj+GbIBi4D+K -b813iKq4+cn3CjTunREm6A==', - - - '19.0.0beta4' => 'Cum4wIKpCRHNZuOQ/SfDYsIp39/4/Z3EIiMLTV7vFLf1pjsn+q1FRwk7HbT0ileU 9eGbmpJHrmbNFk73g6k2YLOeosznMD89+AtRrRRn7C+sJmXx90+Eejs1aWWBRi8j wnC4PNYGZCqV10z+bMWNFWuZlkO2o2c+o8I/mIM93trRgnciFzA2YYAILnz4vZ5L diff --git a/tests/features/stable16.feature b/tests/features/stable16.feature deleted file mode 100644 index 5ed5e8e3..00000000 --- a/tests/features/stable16.feature +++ /dev/null @@ -1,23 +0,0 @@ -Feature: CLI updater - stable16 base - - Scenario: Update is available - 16.0.1 to 16.0.3 - Given the current installed version is 16.0.0 - And there is an update to version 16.0.3 available - When the CLI updater is run successfully - And the output should contain "Update successful" - Then the installed version should be 16.0 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available - 16.0.0 to master daily - Given the current installed version is 16.0.0 - And the current channel is "daily" - And there is an update to daily version of master available -# TODO broken due to files_texteditor removal -# When the CLI updater is run successfully -# And the output should contain "Update successful" -# Then the installed version should be 17.0 -# And maintenance mode should be off -# And upgrade is not required - - diff --git a/tests/features/stable21.feature b/tests/features/stable21.feature new file mode 100644 index 00000000..cafe6ee2 --- /dev/null +++ b/tests/features/stable21.feature @@ -0,0 +1,10 @@ +Feature: CLI updater - stable21 base + + Scenario: Update is available - 21.0.0 RC 1 to 21.0.0 + Given the current installed version is 21.0.0RC1 + And there is an update to version 21.0.0 available + When the CLI updater is run successfully + And the output should contain "Update successful" + Then the installed version should be 21.0 + And maintenance mode should be off + And upgrade is not required