From 1e8954388981bca8926eaee947323dd60e5abc23 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 27 Aug 2021 11:35:50 +0200
Subject: [PATCH] CI: use rabbitmq version 3.8 and lastest postgres

---
 .gitlab-ci.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70c184f..c59c6b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,6 @@ variables:
   DOCKER_TAG: ${CI_COMMIT_BRANCH}
   DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}
   FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
-  KUBERNETES_SERVICE_MEMORY_REQUEST: 1Gi
-  KUBERNETES_SERVICE_MEMORY_LIMIT: 2Gi
-  KUBERNETES_SERVICE_EPHEMERAL_STORAGE_REQUEST: 512Mi
-  KUBERNETES_SERVICE_EPHEMERAL_STORAGE_LIMIT: 1Gi
 
 stages:
   - test
@@ -23,8 +19,8 @@ test:
     POSTGRES_USER: villas
     POSTGRES_PASSWORD: villas
     POSTGRES_HOST: postgres
-    DEFAULT_USER: villas
-    DEFAULT_PASS: villas
+    RABBITMQ_DEFAULT_USER: villas
+    RABBITMQ_DEFAULT_PASS: villas
     MINIO_ROOT_USER: minio-villas
     MINIO_ROOT_PASSWORD: minio-villas
     MINIO_REGION_NAME: default
@@ -46,11 +42,8 @@ test:
     BASE_PATH: /api
     MODE: release
   services:
-    - name: postgres:9.6
-      #command: ["sh", "-c", "sed -i -r 's/#huge_pages.*?/huge_pages = off/g' /usr/share/postgresql/postgresql.conf.sample ; su - postgres -c '/usr/lib/postgresql/9.6/bin/postgres --config-file=/usr/share/postgresql/postgresql.conf.sample -D /var/lib/postgresql/data'"]
-      #command: ["postgres", "--huge_pages=off"]
-      alias: postgres
-    - rabbitmq:3
+    - postgres:latest
+    - rabbitmq:3.8
     - name: minio/minio:RELEASE.2021-01-16T02-19-44Z
       command: ['server', '/minio']
       alias: minio