Set PostgreSQL as optional

It was needed by Cachet which passed as optional. Signed-off-by: Cédric Ollivier <[email protected]>
collivier · Jul 3, 2023 · 95535a2 · 95535a2
1 parent 2633ecf
commit 95535a2
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 17 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -242,7 +242,7 @@ testapi_base_url: http://{{ external_ipaddress }}:{{ testapi_port }}
 testapi_wait: 30
 
 # postgres
-postgres_deploy: true
+postgres_deploy: false
 postgres_port: 5432
 postgres_host: '{{ ipaddress }}'
 postgres_username: postgres

diff --git a/tests/all.yml b/tests/all.yml
@@ -2,6 +2,7 @@
 - hosts: 127.0.0.1
   roles:
     - role: collivier.xtesting
+      postgres_deploy: true
       cachet_deploy: true
       gitlab_deploy: true
       influxdb_deploy: true

diff --git a/tests/gitlab_kind.yml b/tests/gitlab_kind.yml
@@ -9,9 +9,6 @@
       radosgw_deploy: false
       mongo_deploy: false
       testapi_deploy: false
-      registry_deploy: false
-      postgres_deploy: false
-      cachet_deploy: false
       project: functest-kubernetes
 - hosts: 127.0.0.1
   tasks:

diff --git a/tests/k8s_gitlab_kind2.yml b/tests/k8s_gitlab_kind2.yml
@@ -43,6 +43,8 @@
       use_node: true
       gitlab_privaterunner_deploy: true
       gitlab_privaterunner_network_mode: host
+      postgres_deploy: true
+      cachet_deploy: true
       use_artifacts: true
       project: functest-kubernetes
       db_project: functest

diff --git a/tests/k8s_gitlab_kind3.yml b/tests/k8s_gitlab_kind3.yml
@@ -7,12 +7,8 @@
       gitlab_deploy: true
       gitlab_create_jobs: false
       minio_deploy: false
-      radosgw_deploy: false
       mongo_deploy: false
       testapi_deploy: false
-      registry_deploy: false
-      postgres_deploy: false
-      cachet_deploy: false
       project: functest-kubernetes
 - hosts: 127.0.0.1
   tasks:

diff --git a/tests/kubernetes0.yml b/tests/kubernetes0.yml
@@ -3,6 +3,7 @@
   roles:
     - role: collivier.xtesting
       kubernetes_deploy: true
+      postgres_deploy: true
       cachet_deploy: true
       jenkins_agent_deploy: true
       influxdb_deploy: true

diff --git a/tests/kubernetes1.yml b/tests/kubernetes1.yml
@@ -19,6 +19,7 @@
     - role: collivier.xtesting
       use_kubernetes: true
       use_node: true
+      postgres_deploy: true
       cachet_deploy: true
       jenkins_agent_deploy: true
       influxdb_deploy: true

diff --git a/tests/pi0.yml b/tests/pi0.yml
@@ -88,9 +88,6 @@
       minio_deploy: false
       mongo_deploy: false
       testapi_deploy: false
-      postgres_deploy: false
-      cachet_deploy: false
-      registry_deploy: false
       jenkins_agent_deploy: true
       jenkins_agent_name: pi
       jenkins_url: "http://{{ hostvars[inventory_hostname][

diff --git a/tests/pi1.yml b/tests/pi1.yml
@@ -60,9 +60,6 @@
       minio_deploy: false
       mongo_deploy: false
       testapi_deploy: false
-      postgres_deploy: false
-      cachet_deploy: false
-      registry_deploy: false
       jenkins_agent_deploy: true
       jenkins_agent_name: pi
       jenkins_url: "http://{{ hostvars[inventory_hostname][

diff --git a/tests/pi2.yml b/tests/pi2.yml
@@ -59,8 +59,6 @@
       minio_deploy: false
       mongo_deploy: false
       testapi_deploy: false
-      postgres_deploy: false
-      cachet_deploy: false
       registry_deploy: false
       jenkins_agent_deploy: true
       jenkins_agent_name: pi

diff --git a/tests/podman.yml b/tests/podman.yml
@@ -3,6 +3,7 @@
   roles:
     - role: collivier.xtesting
       use_podman: true
+      postgres_deploy: true
       cachet_deploy: true
       # gitlab_deploy: true
       influxdb_deploy: true

diff --git a/tests/proxy.yml b/tests/proxy.yml
@@ -26,6 +26,7 @@
   roles:
     - role: collivier.xtesting
       cachet_deploy: true
+      postgres_deploy: true
       gitlab_deploy: true
       influxdb_deploy: true
       grafana_deploy: true

diff --git a/tests/proxy_kubernetes.yml b/tests/proxy_kubernetes.yml
@@ -26,6 +26,7 @@
   roles:
     - role: collivier.xtesting
       kubernetes_deploy: true
+      postgres_deploy: true
       cachet_deploy: true
       jenkins_agent_deploy: true
       influxdb_deploy: true

diff --git a/tests/runner.yml b/tests/runner.yml
@@ -6,6 +6,10 @@
       minio_configure: false
       testapi_configure: false
       cachet_configure: false
+      cachet_deploy: true
+      postgres_deploy: true
+      cachet_configure: false
+      postgres_configure: false
       docker_tags: []
       suites: []
     - role: collivier.xtesting
@@ -35,5 +39,5 @@
       testapi_deploy: false
       testapi_configure: true
       cachet_url: "http://{{ ansible_default_ipv4.address }}:{{ cachet_port }}/api/v1"
-      cachet_deploy: false
       cachet_configure: true
+      postgres_configure: true
diff --git a/tests/twice.yml b/tests/twice.yml
@@ -2,6 +2,7 @@
 - hosts: 127.0.0.1
   roles:
     - role: collivier.xtesting
+      postgres_deploy: true
       cachet_deploy: true
     - role: collivier.xtesting
       jenkins_deploy: false
@@ -13,5 +14,6 @@
       testapi_configure: true
       registry_deploy: false
       postgres_deploy: false
+      postgres_configure: true
       cachet_deploy: false
       cachet_configure: true