Switch OSMF default site to bare domain

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index ca4895b68b5d0f59c10ace98f5a364436ddd5e8c..3d96745332732d93d53b5721b5e32115160cb581 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -6,6 +6,13 @@ driver:
     - /var/lib/docker
   env:
     - container=dokken
     - /var/lib/docker
   env:
     - container=dokken

+  ipv6: true
+  ipv6_subnet: "fd95:8552:964c::/64"
+  dns:
+    - 1.1.1.1
+    - 8.8.8.8
+    - 8.8.4.4
+    - 1.0.0.1

 
 transport:
   name: dokken
 
 transport:
   name: dokken


@@ -15,26 +22,41 @@ provisioner:
   chef_license: accept
   data_bags_path: test/data_bags
   slow_resource_report: true
   chef_license: accept
   data_bags_path: test/data_bags
   slow_resource_report: true

+  clean_dokken_sandbox: true

 
 verifier:
 
 verifier:

+  name: inspec

   root_path: /opt/verifier
   sudo: false
 
 platforms:
   - name: ubuntu-20.04
     driver:
   root_path: /opt/verifier
   sudo: false
 
 platforms:
   - name: ubuntu-20.04
     driver:

-      image: dokken/ubuntu-20.04
+      image: ghcr.io/test-kitchen/dokken/ubuntu-20.04

       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y

+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo libeatmydata.so >>/etc/ld.so.preload

   - name: ubuntu-22.04
     driver:
   - name: ubuntu-22.04
     driver:

-      image: dokken/ubuntu-22.04
+      image: ghcr.io/test-kitchen/dokken/ubuntu-22.04

       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y

+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo libeatmydata.so >>/etc/ld.so.preload
+  - name: debian-12
+    driver:
+      image: ghcr.io/test-kitchen/dokken/debian-12
+      privileged: true
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update -y
+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo libeatmydata.so >>/etc/ld.so.preload

 
 suites:
   - name: accounts
 
 suites:
   - name: accounts


@@ -46,6 +68,9 @@ suites:
   - name: apt
     run_list:
       - recipe[apt::default]
   - name: apt
     run_list:
       - recipe[apt::default]

+  - name: awscli
+    run_list:
+      - recipe[awscli::default]

   - name: backup
     run_list:
       - recipe[backup::default]
   - name: backup
     run_list:
       - recipe[backup::default]


@@ -113,9 +138,6 @@ suites:
   - name: docker
     run_list:
       - recipe[docker::default]
   - name: docker
     run_list:
       - recipe[docker::default]

-  - name: donate
-    run_list:
-      - recipe[donate::default]

   - name: elasticsearch
     run_list:
       - recipe[elasticsearch::default]
   - name: elasticsearch
     run_list:
       - recipe[elasticsearch::default]


@@ -178,9 +200,9 @@ suites:
   - name: hot
     run_list:
       - recipe[hot::default]
   - name: hot
     run_list:
       - recipe[hot::default]

-  - name: incron
+  - name: ideditor

     run_list:
     run_list:

-      - recipe[incron::default]
+      - recipe[ideditor::default]

   - name: irc
     run_list:
       - recipe[irc::default]
   - name: irc
     run_list:
       - recipe[irc::default]


@@ -317,9 +339,6 @@ suites:
   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]
   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]

-    attributes:
-      prometheus:
-        promscale: true

   - name: python
     run_list:
       - recipe[python::default]
   - name: python
     run_list:
       - recipe[python::default]


@@ -372,9 +391,6 @@ suites:
   - name: tilelog
     run_list:
       - recipe[tilelog::default]
   - name: tilelog
     run_list:
       - recipe[tilelog::default]

-  - name: timescaledb
-    run_list:
-      - recipe[timescaledb::default]

   - name: tools
     run_list:
       - recipe[tools::default]
   - name: tools
     run_list:
       - recipe[tools::default]