From e41db209de82108743b198e8f0319c6a8ca24e7d Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 9 Apr 2021 12:38:24 +0200 Subject: [PATCH 1/4] update ci deps --- .drone.star | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.star b/.drone.star index e404255269..d988a709e1 100644 --- a/.drone.star +++ b/.drone.star @@ -378,7 +378,7 @@ def uploadScanResults(ctx): 'steps': [ { 'name': 'clone', - 'image': 'alpine/git', + 'image': 'alpine/git:latest', 'commands': [ 'git clone https://github.com/%s.git .' % (repo_slug), 'git checkout $DRONE_COMMIT', @@ -386,7 +386,7 @@ def uploadScanResults(ctx): }, { 'name': 'sync-from-cache', - 'image': 'minio/mc:RELEASE.2021-02-19T05-34-40Z', + 'image': 'minio/mc:RELEASE.2021-03-23T05-46-11Z', 'environment': { 'MC_HOST_cachebucket': { 'from_secret': 'cache_s3_connection_url' @@ -409,13 +409,13 @@ def uploadScanResults(ctx): }, { 'name': 'sonarcloud', - 'image': 'sonarsource/sonar-scanner-cli', + 'image': 'sonarsource/sonar-scanner-cli:latest', 'pull': 'always', 'environment': sonar_env, }, { 'name': 'purge-cache', - 'image': 'minio/mc:RELEASE.2020-12-10T01-26-17Z', + 'image': 'minio/mc:RELEASE.2021-03-23T05-46-11Z', 'environment': { 'MC_HOST_cachebucket': { 'from_secret': 'cache_s3_connection_url' @@ -557,7 +557,7 @@ def uiTestPipeline(ctx, suiteName, storage = 'owncloud', accounts_hash_difficult ocisServer(storage, accounts_hash_difficulty, [stepVolumeOC10Tests]) + [ { 'name': 'webUITests', - 'image': 'webhippie/nodejs:latest', + 'image': 'owncloudci/nodejs:15', 'pull': 'always', 'environment': { 'SERVER_HOST': 'https://ocis-server:9200', @@ -624,7 +624,7 @@ def accountsUITests(ctx, storage = 'owncloud', accounts_hash_difficulty = 4): ocisServer(storage, accounts_hash_difficulty, [stepVolumeOC10Tests]) + [ { 'name': 'WebUIAcceptanceTests', - 'image': 'webhippie/nodejs:latest', + 'image': 'owncloudci/nodejs:15', 'pull': 'always', 'environment': { 'SERVER_HOST': 'https://ocis-server:9200', @@ -1274,7 +1274,7 @@ def makeGenerate(module): return [ { 'name': 'generate nodejs', - 'image': 'owncloudci/nodejs:12', + 'image': 'owncloudci/nodejs:15', 'pull': 'always', 'commands': [ '%s ci-node-generate' % (make), @@ -1566,7 +1566,7 @@ def genericCachePurge(ctx, name, cache_key): 'steps': [ { 'name': 'purge-cache', - 'image': 'minio/mc:RELEASE.2020-12-10T01-26-17Z', + 'image': 'minio/mc:RELEASE.2021-03-23T05-46-11Z', 'failure': 'ignore', 'environment': { 'MC_HOST_cache': { From 5e8d477036675af2d2f57bf37c5a07407279f944 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 12 Apr 2021 08:40:54 +0200 Subject: [PATCH 2/4] use bash --- .drone.star | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.star b/.drone.star index d988a709e1..c0bcde4cad 100644 --- a/.drone.star +++ b/.drone.star @@ -573,6 +573,7 @@ def uiTestPipeline(ctx, suiteName, storage = 'owncloud', accounts_hash_difficult 'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures-webUI-on-%s-storage.md' % (storage.upper()), }, 'commands': [ + '/bin/bash', 'source /drone/src/.drone.env', 'git clone -b master --depth=1 https://github.com/owncloud/testing.git /srv/app/testing', 'git clone -b $WEB_BRANCH --single-branch --no-tags https://github.com/owncloud/web.git /srv/app/web', @@ -640,6 +641,7 @@ def accountsUITests(ctx, storage = 'owncloud', accounts_hash_difficulty = 4): 'FEATURE_PATH': '/drone/src/accounts/ui/tests/acceptance/features', }, 'commands': [ + '/bin/bash', 'source /drone/src/.drone.env', 'git clone -b master --depth=1 https://github.com/owncloud/testing.git /srv/app/testing', 'git clone -b $WEB_BRANCH --single-branch --no-tags https://github.com/owncloud/web.git /srv/app/web', From df6cd1cb1644a10e38f3e687f3cc245dc1f516fd Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 12 Apr 2021 09:11:48 +0200 Subject: [PATCH 3/4] replace source --- .drone.star | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index c0bcde4cad..8154e742ac 100644 --- a/.drone.star +++ b/.drone.star @@ -573,8 +573,7 @@ def uiTestPipeline(ctx, suiteName, storage = 'owncloud', accounts_hash_difficult 'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures-webUI-on-%s-storage.md' % (storage.upper()), }, 'commands': [ - '/bin/bash', - 'source /drone/src/.drone.env', + '. /drone/src/.drone.env', 'git clone -b master --depth=1 https://github.com/owncloud/testing.git /srv/app/testing', 'git clone -b $WEB_BRANCH --single-branch --no-tags https://github.com/owncloud/web.git /srv/app/web', 'cd /srv/app/web', @@ -641,8 +640,7 @@ def accountsUITests(ctx, storage = 'owncloud', accounts_hash_difficulty = 4): 'FEATURE_PATH': '/drone/src/accounts/ui/tests/acceptance/features', }, 'commands': [ - '/bin/bash', - 'source /drone/src/.drone.env', + '. /drone/src/.drone.env', 'git clone -b master --depth=1 https://github.com/owncloud/testing.git /srv/app/testing', 'git clone -b $WEB_BRANCH --single-branch --no-tags https://github.com/owncloud/web.git /srv/app/web', 'cd /srv/app/web', From b789c02166cc508ab8ae5485a431922079750c7d Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 12 Apr 2021 09:23:34 +0200 Subject: [PATCH 4/4] revert to nodejs:14 --- .drone.star | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index 8154e742ac..e87d8f1dad 100644 --- a/.drone.star +++ b/.drone.star @@ -557,7 +557,7 @@ def uiTestPipeline(ctx, suiteName, storage = 'owncloud', accounts_hash_difficult ocisServer(storage, accounts_hash_difficulty, [stepVolumeOC10Tests]) + [ { 'name': 'webUITests', - 'image': 'owncloudci/nodejs:15', + 'image': 'owncloudci/nodejs:14', 'pull': 'always', 'environment': { 'SERVER_HOST': 'https://ocis-server:9200', @@ -624,7 +624,7 @@ def accountsUITests(ctx, storage = 'owncloud', accounts_hash_difficulty = 4): ocisServer(storage, accounts_hash_difficulty, [stepVolumeOC10Tests]) + [ { 'name': 'WebUIAcceptanceTests', - 'image': 'owncloudci/nodejs:15', + 'image': 'owncloudci/nodejs:14', 'pull': 'always', 'environment': { 'SERVER_HOST': 'https://ocis-server:9200', @@ -1274,7 +1274,7 @@ def makeGenerate(module): return [ { 'name': 'generate nodejs', - 'image': 'owncloudci/nodejs:15', + 'image': 'owncloudci/nodejs:14', 'pull': 'always', 'commands': [ '%s ci-node-generate' % (make),