From 79629f0aaab0364d231bf31bfebbb9c695e0ddaa Mon Sep 17 00:00:00 2001 From: acsfer Date: Fri, 4 Feb 2022 12:54:17 +0100 Subject: [PATCH 1/8] Update drone - Remove MariaDB 10.1 (EOL) - Always test latest --- .drone.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index 95b28731e345b..76de38b2c866e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ steps: commands: - git submodule update --init - name: checkers - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - ./autotest-checkers.sh secrets: [ github_token ] @@ -224,7 +224,7 @@ steps: commands: - git submodule update --init - name: nodb-php7.4 - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-php-tests.sh || exit 0 - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite @@ -256,7 +256,7 @@ steps: commands: - git submodule update --init - name: sqlite-php7.4 - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-php-tests.sh || exit 0 - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite @@ -280,15 +280,15 @@ trigger: --- kind: pipeline -name: mariadb10.1-php7.4 +name: mariadb10.4-php7.4 steps: - name: submodules image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest commands: - git submodule update --init -- name: mariadb10.1-php7.4 - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 +- name: mariadb10.4-php7.4 + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-php-tests.sh || exit 0 - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb @@ -297,7 +297,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb - image: ghcr.io/nextcloud/continuous-integration-mariadb-10.1:10.1 + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:latest environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest @@ -333,7 +333,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb - image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:10.4 + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:latest environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest @@ -396,7 +396,7 @@ steps: commands: - git submodule update --init - name: mysql-php7.4 - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-php-tests.sh || exit 0 - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql @@ -433,7 +433,7 @@ steps: commands: - git submodule update --init - name: postgres-php7.4 - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-php-tests.sh || exit 0 - sleep 10 # gives the database enough time to initialize @@ -469,7 +469,7 @@ steps: commands: - git submodule update --init - name: postgres-php7.4 - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-php-tests.sh || exit 0 - sleep 10 # gives the database enough time to initialize @@ -479,7 +479,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-11 - image: ghcr.io/nextcloud/continuous-integration-postgres-11:postgres-11 + image: ghcr.io/nextcloud/continuous-integration-postgres-11:latest environment: POSTGRES_USER: oc_autotest POSTGRES_DB: oc_autotest_dummy @@ -515,7 +515,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-13 - image: ghcr.io/nextcloud/continuous-integration-postgres-13:postgres-13 + image: ghcr.io/nextcloud/continuous-integration-postgres-13:latest environment: POSTGRES_USER: oc_autotest POSTGRES_DB: oc_autotest_dummy @@ -1830,7 +1830,7 @@ steps: commands: - git submodule update --init - name: nodb-codecov - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest environment: CODECOV_TOKEN: from_secret: CODECOV_TOKEN @@ -1862,7 +1862,7 @@ steps: commands: - git submodule update --init - name: db-codecov - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest environment: CODECOV_TOKEN: from_secret: CODECOV_TOKEN @@ -1903,7 +1903,7 @@ steps: commands: - git submodule update --init - name: object-store - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest environment: OBJECT_STORE: s3 CODECOV_TOKEN: @@ -1933,7 +1933,7 @@ steps: commands: - git submodule update --init - name: object-store - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest environment: OBJECT_STORE: azure CODECOV_TOKEN: From 258515da6d7fd2a50d04397ed03304958b60e09a Mon Sep 17 00:00:00 2001 From: acsfer Date: Fri, 4 Feb 2022 13:00:58 +0100 Subject: [PATCH 2/8] Typo fix --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 76de38b2c866e..ad3afc2bea294 100644 --- a/.drone.yml +++ b/.drone.yml @@ -479,7 +479,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-11 - image: ghcr.io/nextcloud/continuous-integration-postgres-11:latest + image: ghcr.io/nextcloud/continuous-integration-postgres-11:postgres-11 environment: POSTGRES_USER: oc_autotest POSTGRES_DB: oc_autotest_dummy @@ -515,7 +515,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: postgres-13 - image: ghcr.io/nextcloud/continuous-integration-postgres-13:latest + image: ghcr.io/nextcloud/continuous-integration-postgres-13:postgres-13 environment: POSTGRES_USER: oc_autotest POSTGRES_DB: oc_autotest_dummy From d1750dee05380173ce2a5243ce032e006ca3c368 Mon Sep 17 00:00:00 2001 From: acsfer Date: Sat, 5 Feb 2022 14:38:18 +0100 Subject: [PATCH 3/8] Fix tests --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index ad3afc2bea294..cc0a34cef8ac0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -297,7 +297,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb - image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:latest + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:10.4 environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest @@ -333,7 +333,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb - image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:latest + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:10.4 environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest From c23b938358ff89ef90592b0112d3e0e5ee0029ea Mon Sep 17 00:00:00 2001 From: acsfer Date: Sun, 6 Feb 2022 10:23:30 +0100 Subject: [PATCH 4/8] Replace with 10.2 --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index cc0a34cef8ac0..6d8fd66a31904 100644 --- a/.drone.yml +++ b/.drone.yml @@ -280,7 +280,7 @@ trigger: --- kind: pipeline -name: mariadb10.4-php7.4 +name: mariadb10.2-php7.4 steps: - name: submodules @@ -297,7 +297,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb - image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:10.4 + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.2:10.2 environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest @@ -316,7 +316,7 @@ trigger: --- kind: pipeline -name: mariadb10.4-php8.0 +name: mariadb10.2-php8.0 steps: - name: submodules @@ -333,7 +333,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb - image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:10.4 + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.2:10.2 environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest From db789c9983bf7d2bd273e6c01a07ab7a597ea345 Mon Sep 17 00:00:00 2001 From: acsfer Date: Sun, 6 Feb 2022 13:06:57 +0100 Subject: [PATCH 5/8] Update .drone.yml Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com> --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 6d8fd66a31904..e4a1ef8c97c5a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -287,7 +287,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest commands: - git submodule update --init -- name: mariadb10.4-php7.4 +- name: mariadb10.2-php7.4 image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-php-tests.sh || exit 0 From 5d3739cddd40c66cea7460b4b9f26a3b0a4a13f7 Mon Sep 17 00:00:00 2001 From: acsfer Date: Sun, 6 Feb 2022 17:22:00 +0100 Subject: [PATCH 6/8] Keep 10.4 to PHP8 --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index e4a1ef8c97c5a..ec4fe2d12375c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -316,7 +316,7 @@ trigger: --- kind: pipeline -name: mariadb10.2-php8.0 +name: mariadb10.4-php8.0 steps: - name: submodules @@ -333,7 +333,7 @@ services: - name: cache image: ghcr.io/nextcloud/continuous-integration-redis:latest - name: mariadb - image: ghcr.io/nextcloud/continuous-integration-mariadb-10.2:10.2 + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:10.4 environment: MYSQL_ROOT_PASSWORD: owncloud MYSQL_USER: oc_autotest From 6563dd8656d023be8e657bee629adc88db514b43 Mon Sep 17 00:00:00 2001 From: acsfer Date: Mon, 7 Feb 2022 10:53:14 +0100 Subject: [PATCH 7/8] Remove PGsql 9.6 (EOL) --- .drone.yml | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/.drone.yml b/.drone.yml index ec4fe2d12375c..174c6d6384d11 100644 --- a/.drone.yml +++ b/.drone.yml @@ -423,42 +423,6 @@ trigger: - pull_request - push ---- -kind: pipeline -name: postgres9.6-php7.4 - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: postgres-php7.4 - image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest - commands: - - bash tests/drone-run-php-tests.sh || exit 0 - - sleep 10 # gives the database enough time to initialize - - POSTGRES=9 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql - -services: -- name: cache - image: ghcr.io/nextcloud/continuous-integration-redis:latest -- name: postgres-9 - image: ghcr.io/nextcloud/continuous-integration-postgres-9:postgres-9.6 - environment: - POSTGRES_USER: oc_autotest - POSTGRES_DB: oc_autotest_dummy - POSTGRES_PASSWORD: owncloud - tmpfs: - - /var/lib/postgresql/data - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - --- kind: pipeline name: postgres11-php7.4 From 60f854f48c78bdaa12ae5b99b59496a0a5346d5c Mon Sep 17 00:00:00 2001 From: acsfer Date: Mon, 7 Feb 2022 17:02:27 +0100 Subject: [PATCH 8/8] Add Postgres10 --- .drone.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.drone.yml b/.drone.yml index 174c6d6384d11..26ae0cdbfd563 100644 --- a/.drone.yml +++ b/.drone.yml @@ -423,6 +423,42 @@ trigger: - pull_request - push +--- +kind: pipeline +name: postgres10-php7.4 + +steps: +- name: submodules + image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest + commands: + - git submodule update --init +- name: postgres-php7.4 + image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 + commands: + - bash tests/drone-run-php-tests.sh || exit 0 + - sleep 10 # gives the database enough time to initialize + - POSTGRES=10 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql + +services: +- name: cache + image: ghcr.io/nextcloud/continuous-integration-redis:latest +- name: postgres-10 + image: ghcr.io/nextcloud/continuous-integration-postgres-10:postgres-10 + environment: + POSTGRES_USER: oc_autotest + POSTGRES_DB: oc_autotest_dummy + POSTGRES_PASSWORD: owncloud + tmpfs: + - /var/lib/postgresql/data + +trigger: + branch: + - master + - stable* + event: + - pull_request + - push + --- kind: pipeline name: postgres11-php7.4