17750: Update example postgresql configuration for Centos 7

[arvados-formula.git] / kitchen.yml

diff --git a/kitchen.yml b/kitchen.yml
index a511ce8fe5df3b0625f9f53e85b70747d18889df..d0ee227eb94bbfcf654cc3d9a8e4123a964d2039 100644 (file)
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
+
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 ---
 # For help on this file's format, see https://kitchen.ci/
 driver:
@@ -25,21 +29,9 @@ platforms:
   - name: ubuntu-1604-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-16.04
-  - name: centos-8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:centos-8
   - name: centos-7-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-7
-  - name: amazonlinux-2-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:amazonlinux-2
-  - name: oraclelinux-8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:oraclelinux-8
-  - name: oraclelinux-7-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:oraclelinux-7
 
   ## SALT `master`
   - name: debian-10-master-py3
@@ -57,50 +49,26 @@ platforms:
   - name: ubuntu-1604-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-16.04
-  - name: centos-8-master-py3
-    driver:
-      image: saltimages/salt-master-py3:centos-8
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
-  - name: amazonlinux-2-master-py3
-    driver:
-      image: saltimages/salt-master-py3:amazonlinux-2
-  - name: oraclelinux-8-master-py3
-    driver:
-      image: saltimages/salt-master-py3:oraclelinux-8
-  - name: oraclelinux-7-master-py3
-    driver:
-      image: saltimages/salt-master-py3:oraclelinux-7
 
-  ## SALT `3003.0`
-  - name: debian-10-3003-0-py3
-    driver:
-      image: saltimages/salt-3003.0-py3:debian-10
-  - name: debian-9-3003-0-py3
-    driver:
-      image: saltimages/salt-3003.0-py3:debian-9
-  - name: ubuntu-2004-3003-0-py3
+  ## SALT `3003.1`
+  - name: debian-10-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:ubuntu-20.04
-  - name: ubuntu-1804-3003-0-py3
+      image: saltimages/salt-3003.1-py3:debian-10
+  - name: debian-9-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:ubuntu-18.04
-  - name: centos-8-3003-0-py3
+      image: saltimages/salt-3003.1-py3:debian-9
+  - name: ubuntu-2004-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:centos-8
-  - name: centos-7-3003-0-py3
+      image: saltimages/salt-3003.1-py3:ubuntu-20.04
+  - name: ubuntu-1804-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:centos-7
-  - name: amazonlinux-2-3003-0-py3
+      image: saltimages/salt-3003.1-py3:ubuntu-18.04
+  - name: centos-7-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:amazonlinux-2
-  - name: oraclelinux-8-3003-0-py3
-    driver:
-      image: saltimages/salt-3003.0-py3:oraclelinux-8
-  - name: oraclelinux-7-3003-0-py3
-    driver:
-      image: saltimages/salt-3003.0-py3:oraclelinux-7
+      image: saltimages/salt-3003.1-py3:centos-7
 
   ## SALT `3002.6`
   - name: debian-10-3002-6-py3
@@ -118,21 +86,9 @@ platforms:
   - name: ubuntu-1604-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:ubuntu-16.04
-  - name: centos-8-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:centos-8
   - name: centos-7-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:centos-7
-  - name: amazonlinux-2-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:oraclelinux-7
 
   ## SALT `3001.7`
   - name: debian-10-3001-7-py3
@@ -150,21 +106,9 @@ platforms:
   - name: ubuntu-1604-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:ubuntu-16.04
-  - name: centos-8-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:centos-8
   - name: centos-7-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:centos-7
-  - name: amazonlinux-2-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:oraclelinux-7
 
   ## SALT `3000.9`
   - name: debian-10-3000-9-py3
@@ -179,21 +123,9 @@ platforms:
   - name: ubuntu-1604-3000-9-py3
     driver:
       image: saltimages/salt-3000.9-py3:ubuntu-16.04
-  - name: centos-8-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:centos-8
   - name: centos-7-3000-9-py3
     driver:
       image: saltimages/salt-3000.9-py3:centos-7
-  - name: amazonlinux-2-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:amazonlinux-2
-  - name: oraclelinux-8-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:oraclelinux-8
-  - name: oraclelinux-7-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:oraclelinux-7
   - name: ubuntu-1804-3000-9-py2
     driver:
       image: saltimages/salt-3000.9-py2:ubuntu-18.04
@@ -241,11 +173,11 @@ suites:
         base:
           '*':
             - arvados._mapdata
+            - postgres
             - single_host.host_entries
             - single_host.snakeoil_certs
             - locale
             - nginx.passenger
-            - postgres
             - arvados.repo
             - arvados.api
             - arvados.websocket