From 9779951f90856b65a4ab7f01fd1751eab70e4424 Mon Sep 17 00:00:00 2001
From: Mikko Nieminen <mikko.nieminen@bih-charite.de>
Date: Fri, 20 Sep 2024 11:32:33 +0200
Subject: [PATCH] upgrade to irods v4.3.3 in ci (#1815)

---
 .github/workflows/build.yml | 16 ++--------------
 CHANGELOG.rst               |  1 +
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f7b5cd5d..da691de7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,17 +24,6 @@ jobs:
           --health-retries 10
         ports:
           - 5432:5432
-      # TODO: Remove temporary iRODS postgres server once on iRODS 4.3
-      postgres-irods:
-        image: postgres:11
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        options: >-
-          --health-cmd "pg_isready -U postgres"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 10
       redis:
         image: redis
         options: >-
@@ -45,12 +34,11 @@ jobs:
         ports:
           - 6379:6379
       irods:
-        # TODO: Update image to 4.3 once its made default
-        image: ghcr.io/bihealth/irods-docker:4.2.11-1
+        image: ghcr.io/bihealth/irods-docker:4.3.3-wip
         env:
           IRODS_AUTHENTICATION_SCHEME: native
           IRODS_DEFAULT_HASH_SCHEME: MD5
-          IRODS_ICAT_DBSERVER: postgres-irods  # TODO: Use main postgres on 4.3
+          IRODS_ICAT_DBSERVER: postgres
           IRODS_ICAT_DBUSER: postgres
           IRODS_ICAT_DBPASS: postgres
           IRODS_ZONE_NAME: sodarZone
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 02bca68d..d2caae61 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -30,6 +30,7 @@ Changed
     - Upgrade Python and Vue app dependencies (#1922, #1959)
     - Unify base test class naming (#2001)
     - Update ``Dockerfile`` for v1.0 upgrades (#2003, #2004)
+    - Upgrade to iRODS v4.3.3 in CI (#1815)
 - **Irodsinfo**
     - Update REST API versioning (#1936)
 - **Landingzones**