From 2a984a30cee9a940ebbb0597f22fcd221f10bbee Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 23 Jun 2021 13:53:52 +0200
Subject: [PATCH 01/27] update to ubuntu 20.04

---
 .github/workflows/build.yaml                           | 10 +++++-----
 .../Dockerfile.kitchen                                 |  8 ++++----
 .../{ubuntu16-puppet6 => ubuntu20-puppet6}/Puppetfile  |  0
 .../Dockerfile.kitchen                                 |  8 ++++----
 .../{ubuntu16-puppet7 => ubuntu20-puppet7}/Puppetfile  |  0
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename build/{ubuntu16-puppet6 => ubuntu20-puppet6}/Dockerfile.kitchen (82%)
 rename build/{ubuntu16-puppet6 => ubuntu20-puppet6}/Puppetfile (100%)
 rename build/{ubuntu16-puppet7 => ubuntu20-puppet7}/Dockerfile.kitchen (82%)
 rename build/{ubuntu16-puppet7 => ubuntu20-puppet7}/Puppetfile (100%)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index cfed22d4..a9c7bdc3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -123,15 +123,15 @@ jobs:
           - ruby: '2.7'
             name: 'centos7-puppet7-python36'
           - ruby: '2.7'
-            name: 'ubuntu16-puppet6'
+            name: 'ubuntu18-puppet6'
           - ruby: '2.7'
-            name: 'ubuntu16-puppet7'
+            name: 'ubuntu18-puppet7'
           - ruby: '2.7'
-            name: 'ubuntu16-puppet7-python36'
+            name: 'ubuntu20-puppet6'
           - ruby: '2.7'
-            name: 'ubuntu18-puppet6'
+            name: 'ubuntu20-puppet7'
           - ruby: '2.7'
-            name: 'ubuntu18-puppet7'
+            name: 'ubuntu20-puppet7-python36'
     env:
       CHECK: '${{ matrix.check }}'
     steps:
diff --git a/build/ubuntu16-puppet6/Dockerfile.kitchen b/build/ubuntu20-puppet6/Dockerfile.kitchen
similarity index 82%
rename from build/ubuntu16-puppet6/Dockerfile.kitchen
rename to build/ubuntu20-puppet6/Dockerfile.kitchen
index 18e3065d..d39390fb 100644
--- a/build/ubuntu16-puppet6/Dockerfile.kitchen
+++ b/build/ubuntu20-puppet6/Dockerfile.kitchen
@@ -1,7 +1,7 @@
 # usage (from the root of the puppet-st2/ directory):
-# docker build -t stackstorm/puppet-st2-ubuntu16-puppet6 -f build/ubuntu16-puppet6/Dockerfile.kitchen .
+# docker build -t stackstorm/puppet-st2-ubuntu20-puppet6 -f build/ubuntu20-puppet6/Dockerfile.kitchen .
 
-FROM stackstorm/packagingtest:xenial-systemd
+FROM stackstorm/packagingtest:focal-systemd
 
 # kitchen setup
 RUN mkdir -p /var/run/sshd
@@ -20,8 +20,8 @@ RUN sudo apt-get -y update
 
 # install puppet
 # https://puppet.com/docs/puppet/6.0/puppet_platform.html
-RUN wget https://apt.puppetlabs.com/puppet6-release-xenial.deb
-RUN sudo dpkg -i puppet6-release-xenial.deb
+RUN wget https://apt.puppetlabs.com/puppet6-release-focal.deb
+RUN sudo dpkg -i puppet6-release-focal.deb
 RUN sudo apt-get -y update
 RUN sudo apt-get -y install puppet-agent
 
diff --git a/build/ubuntu16-puppet6/Puppetfile b/build/ubuntu20-puppet6/Puppetfile
similarity index 100%
rename from build/ubuntu16-puppet6/Puppetfile
rename to build/ubuntu20-puppet6/Puppetfile
diff --git a/build/ubuntu16-puppet7/Dockerfile.kitchen b/build/ubuntu20-puppet7/Dockerfile.kitchen
similarity index 82%
rename from build/ubuntu16-puppet7/Dockerfile.kitchen
rename to build/ubuntu20-puppet7/Dockerfile.kitchen
index 3029d000..c1d783e0 100644
--- a/build/ubuntu16-puppet7/Dockerfile.kitchen
+++ b/build/ubuntu20-puppet7/Dockerfile.kitchen
@@ -1,7 +1,7 @@
 # usage (from the root of the puppet-st2/ directory):
-# docker build -t stackstorm/puppet-st2-ubuntu16-puppet7 -f build/ubuntu16-puppet7/Dockerfile.kitchen .
+# docker build -t stackstorm/puppet-st2-ubuntu18-puppet7 -f build/ubuntu18-puppet7/Dockerfile.kitchen .
 
-FROM stackstorm/packagingtest:xenial-systemd
+FROM stackstorm/packagingtest:focal-systemd
 
 # kitchen setup
 RUN mkdir -p /var/run/sshd
@@ -20,8 +20,8 @@ RUN sudo apt-get -y update
 
 # install puppet
 # https://puppet.com/docs/puppet/7.0/puppet_platform.html
-RUN wget https://apt.puppetlabs.com/puppet7-release-xenial.deb
-RUN sudo dpkg -i puppet7-release-xenial.deb
+RUN wget https://apt.puppetlabs.com/puppet7-release-focal.deb
+RUN sudo dpkg -i puppet7-release-focal.deb
 RUN sudo apt-get -y update
 RUN sudo apt-get -y install puppet-agent
 
diff --git a/build/ubuntu16-puppet7/Puppetfile b/build/ubuntu20-puppet7/Puppetfile
similarity index 100%
rename from build/ubuntu16-puppet7/Puppetfile
rename to build/ubuntu20-puppet7/Puppetfile

From ff25573cb8285d11d312b7e6a1634cdbc4507e26 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 23 Jun 2021 14:00:31 +0200
Subject: [PATCH 02/27] add ubuntu20 to kitchen platforms

---
 .kitchen.yml                           | 42 +++++++++++++-------------
 test/integration/stackstorm/inspec.yml |  4 +--
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index dcde9539..f8a9f9b9 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -73,61 +73,61 @@ platforms:
       puppetfile_path: build/centos7-puppet7/Puppetfile
       manifest: test/fullinstall_python36.pp
 
-  # Ubuntu Xenial with Systemd - Puppet 6
-  - name: ubuntu16-puppet6
+  # Ubuntu Bionic with Systemd - Puppet 6
+  - name: ubuntu18-puppet6
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu16-puppet6/Dockerfile.kitchen
+      dockerfile: build/ubuntu18-puppet6/Dockerfile.kitchen
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu16-puppet6/Puppetfile
+      puppetfile_path: build/ubuntu18-puppet6/Puppetfile
 
-  # Ubuntu Xenial with Systemd - Puppet 7
-  - name: ubuntu16-puppet7
+  # Ubuntu Bionic with Systemd - Puppet 7
+  - name: ubuntu18-puppet7
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu16-puppet7/Dockerfile.kitchen
+      dockerfile: build/ubuntu18-puppet7/Dockerfile.kitchen
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu16-puppet7/Puppetfile
+      puppetfile_path: build/ubuntu18-puppet7/Puppetfile
 
-  # Ubuntu Xenial with Systemd - Puppet 7 - Python 3.6
-  - name: ubuntu16-puppet7-python36
+  # Ubuntu Focal with Systemd - Puppet 6
+  - name: ubuntu20-puppet6
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu16-puppet7/Dockerfile.kitchen
+      dockerfile: build/ubuntu20-puppet6/Dockerfile.kitchen
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu16-puppet7/Puppetfile
-      manifest: test/fullinstall_python36.pp
+      puppetfile_path: build/ubuntu20-puppet6/Puppetfile
 
-  # Ubuntu Bionic with Systemd - Puppet 6
-  - name: ubuntu18-puppet6
+  # Ubuntu Focal with Systemd - Puppet 7
+  - name: ubuntu20-puppet7
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu18-puppet6/Dockerfile.kitchen
+      dockerfile: build/ubuntu20-puppet7/Dockerfile.kitchen
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu18-puppet6/Puppetfile
+      puppetfile_path: build/ubuntu20-puppet7/Puppetfile
 
-  # Ubuntu Bionic with Systemd - Puppet 7
-  - name: ubuntu18-puppet7
+  # Ubuntu Focal with Systemd - Puppet 7 - Python 3.6
+  - name: ubuntu20-puppet7-python36
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu18-puppet7/Dockerfile.kitchen
+      dockerfile: build/ubuntu20-puppet7/Dockerfile.kitchen
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu18-puppet7/Puppetfile
+      puppetfile_path: build/ubuntu20-puppet7/Puppetfile
+      manifest: test/fullinstall_python36.pp
 
 suites:
   - name: default
diff --git a/test/integration/stackstorm/inspec.yml b/test/integration/stackstorm/inspec.yml
index 45504851..aadb1f8c 100644
--- a/test/integration/stackstorm/inspec.yml
+++ b/test/integration/stackstorm/inspec.yml
@@ -12,7 +12,7 @@ version: 0.1.0
 supports:
   - os-name: centos
     release: 7.*
-  - os-name: ubuntu
-    release: 16.04
   - os-name: ubuntu
     release: 18.04
+  - os-name: ubuntu
+    release: 20.04

From a0d2c8fbeb135e6e6ec70b691b734dc66bc1a93d Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 23 Jun 2021 14:13:39 +0200
Subject: [PATCH 03/27] add unstable testing channel for focal

---
 .kitchen.yml                           | 20 ++++++++++++++++----
 manifests/test/fullinstall_unstable.pp |  5 +++++
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 manifests/test/fullinstall_unstable.pp

diff --git a/.kitchen.yml b/.kitchen.yml
index f8a9f9b9..0ea9fb5c 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -95,6 +95,18 @@ platforms:
     provisioner:
       puppetfile_path: build/ubuntu18-puppet7/Puppetfile
 
+  # Ubuntu Bionic with Systemd - Puppet 7 - Python 3.6
+  - name: ubuntu18-puppet7-python36
+    driver:
+      platform: ubuntu
+      dockerfile: build/ubuntu18-puppet7/Dockerfile.kitchen
+      run_command: /sbin/init
+      volume:
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    provisioner:
+      puppetfile_path: build/ubuntu18-puppet7/Puppetfile
+      manifest: test/fullinstall_python36.pp
+
   # Ubuntu Focal with Systemd - Puppet 6
   - name: ubuntu20-puppet6
     driver:
@@ -116,9 +128,9 @@ platforms:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
       puppetfile_path: build/ubuntu20-puppet7/Puppetfile
-
-  # Ubuntu Focal with Systemd - Puppet 7 - Python 3.6
-  - name: ubuntu20-puppet7-python36
+  
+  # Ubuntu Focal with Systemd - Puppet 7 - Unstable repo
+  - name: ubuntu20-puppet7-unstable
     driver:
       platform: ubuntu
       dockerfile: build/ubuntu20-puppet7/Dockerfile.kitchen
@@ -127,7 +139,7 @@ platforms:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
       puppetfile_path: build/ubuntu20-puppet7/Puppetfile
-      manifest: test/fullinstall_python36.pp
+      manifest: test/fullinstall_unstable.pp
 
 suites:
   - name: default
diff --git a/manifests/test/fullinstall_unstable.pp b/manifests/test/fullinstall_unstable.pp
new file mode 100644
index 00000000..9a794f41
--- /dev/null
+++ b/manifests/test/fullinstall_unstable.pp
@@ -0,0 +1,5 @@
+
+class { 'st2':
+  repository => 'unstable',
+}
+include st2::profile::fullinstall

From 7a6a6d2961bea30feeeaca5c67440f0860b93c80 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 23 Jun 2021 14:16:24 +0200
Subject: [PATCH 04/27] update github action build matrix

---
 .github/workflows/build.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a9c7bdc3..ff98b910 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -126,12 +126,14 @@ jobs:
             name: 'ubuntu18-puppet6'
           - ruby: '2.7'
             name: 'ubuntu18-puppet7'
+          - ruby: '2.7'
+            name: 'ubuntu18-puppet7-python36'
           - ruby: '2.7'
             name: 'ubuntu20-puppet6'
           - ruby: '2.7'
             name: 'ubuntu20-puppet7'
           - ruby: '2.7'
-            name: 'ubuntu20-puppet7-python36'
+            name: 'ubuntu20-puppet7-unstable'
     env:
       CHECK: '${{ matrix.check }}'
     steps:

From 0251f3b319a3aa4bb53fb7a1ee974e2979439221 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 23 Jun 2021 14:25:09 +0200
Subject: [PATCH 05/27] use mongo 4.4 for st2 version > 3.4

---
 manifests/profile/mongodb.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/profile/mongodb.pp b/manifests/profile/mongodb.pp
index 52d2b981..be802da3 100644
--- a/manifests/profile/mongodb.pp
+++ b/manifests/profile/mongodb.pp
@@ -39,10 +39,14 @@
   $manage_repo = $st2::mongodb_manage_repo,
   $auth        = $st2::mongodb_auth,
 ) inherits st2 {
+  # if the StackStorm version is > 3.4.0 then MongoDB 4.4
   # if the StackStorm version is > 3.3.0 then MongoDB 4.0
   # if the StackStorm version is > 2.4.0 then MongoDB 3.4
   # else use MongoDB 3.2
-  if st2::version_ge('3.3.0') {
+  if st2::version_ge('3.4.0') {
+    $_mongodb_version_default = '4.4'
+  }
+  elsif st2::version_ge('3.3.0') {
     $_mongodb_version_default = '4.0'
   }
   elsif st2::version_ge('2.4.0') {

From c8154ebdafa462c8c86a3091366041c85cbb93d7 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 23 Jun 2021 14:31:38 +0200
Subject: [PATCH 06/27] change mongo version 4.4 only for 3.5 not for 3.4

---
 manifests/profile/mongodb.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/profile/mongodb.pp b/manifests/profile/mongodb.pp
index be802da3..21783437 100644
--- a/manifests/profile/mongodb.pp
+++ b/manifests/profile/mongodb.pp
@@ -43,7 +43,7 @@
   # if the StackStorm version is > 3.3.0 then MongoDB 4.0
   # if the StackStorm version is > 2.4.0 then MongoDB 3.4
   # else use MongoDB 3.2
-  if st2::version_ge('3.4.0') {
+  if st2::version_ge('3.5.0') {
     $_mongodb_version_default = '4.4'
   }
   elsif st2::version_ge('3.3.0') {

From b2302289e1c60050b6ecfb3be6021fdadeb851ac Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 23 Jun 2021 14:34:47 +0200
Subject: [PATCH 07/27] update mongodb spec with 4.4 as latest version

---
 spec/classes/profile/mongodb_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/profile/mongodb_spec.rb b/spec/classes/profile/mongodb_spec.rb
index 1715ac8f..108d2615 100644
--- a/spec/classes/profile/mongodb_spec.rb
+++ b/spec/classes/profile/mongodb_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'st2::profile::mongodb' do
-  let(:latest_version) { '4.0' }
+  let(:latest_version) { '4.4' }
 
   on_supported_os.each do |os, os_facts|
     let(:facts) { os_facts }

From b0ad1535f94b153ba53cae3a43047924ea92e436 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 23 Jun 2021 14:47:10 +0200
Subject: [PATCH 08/27] Add ubuntu18 unstable pipeline

---
 .github/workflows/build.yaml |  2 ++
 .kitchen.yml                 | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ff98b910..4112d84d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -128,6 +128,8 @@ jobs:
             name: 'ubuntu18-puppet7'
           - ruby: '2.7'
             name: 'ubuntu18-puppet7-python36'
+          - ruby: '2.7'
+            name: 'ubuntu18-puppet7-unstable'
           - ruby: '2.7'
             name: 'ubuntu20-puppet6'
           - ruby: '2.7'
diff --git a/.kitchen.yml b/.kitchen.yml
index 0ea9fb5c..9de3705e 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -106,6 +106,18 @@ platforms:
     provisioner:
       puppetfile_path: build/ubuntu18-puppet7/Puppetfile
       manifest: test/fullinstall_python36.pp
+      
+  # Ubuntu Focal with Systemd - Puppet 7 - Unstable repo
+  - name: ubuntu18-puppet7-unstable
+    driver:
+      platform: ubuntu
+      dockerfile: build/ubuntu18-puppet7/Dockerfile.kitchen
+      run_command: /sbin/init
+      volume:
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    provisioner:
+      puppetfile_path: build/ubuntu18-puppet7/Puppetfile
+      manifest: test/fullinstall_unstable.pp
 
   # Ubuntu Focal with Systemd - Puppet 6
   - name: ubuntu20-puppet6

From 0195239b05080b33f0021e9c6c4b0cfa0a8f6f6e Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 23 Jun 2021 15:37:01 +0200
Subject: [PATCH 09/27] add centos7 unstable build and comment out u20 stable
 build

---
 .github/workflows/build.yaml | 11 +++++---
 .kitchen.yml                 | 53 ++++++++++++++++++++++--------------
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4112d84d..d422fe8c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -122,6 +122,8 @@ jobs:
             name: 'centos7-puppet7'
           - ruby: '2.7'
             name: 'centos7-puppet7-python36'
+          - ruby: '2.7'
+            name: 'centos7-puppet7-unstable'
           - ruby: '2.7'
             name: 'ubuntu18-puppet6'
           - ruby: '2.7'
@@ -130,10 +132,11 @@ jobs:
             name: 'ubuntu18-puppet7-python36'
           - ruby: '2.7'
             name: 'ubuntu18-puppet7-unstable'
-          - ruby: '2.7'
-            name: 'ubuntu20-puppet6'
-          - ruby: '2.7'
-            name: 'ubuntu20-puppet7'
+          # TODO: Uncomment after st2 3.5 packages are available for focal
+          # - ruby: '2.7'
+          #   name: 'ubuntu20-puppet6'
+          # - ruby: '2.7'
+          #   name: 'ubuntu20-puppet7'
           - ruby: '2.7'
             name: 'ubuntu20-puppet7-unstable'
     env:
diff --git a/.kitchen.yml b/.kitchen.yml
index 9de3705e..f43472b3 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -73,6 +73,18 @@ platforms:
       puppetfile_path: build/centos7-puppet7/Puppetfile
       manifest: test/fullinstall_python36.pp
 
+  # CentOS7 with Systemd - Puppet 7 - Unstable
+  - name: centos7-puppet7-unstable
+    driver:
+      platform: centos
+      dockerfile: build/centos7-puppet7/Dockerfile.kitchen
+      run_command: /sbin/init
+      volume:
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    provisioner:
+      puppetfile_path: build/centos7-puppet7/Puppetfile
+      manifest: test/fullinstall_unstable.pp
+
   # Ubuntu Bionic with Systemd - Puppet 6
   - name: ubuntu18-puppet6
     driver:
@@ -119,27 +131,28 @@ platforms:
       puppetfile_path: build/ubuntu18-puppet7/Puppetfile
       manifest: test/fullinstall_unstable.pp
 
-  # Ubuntu Focal with Systemd - Puppet 6
-  - name: ubuntu20-puppet6
-    driver:
-      platform: ubuntu
-      dockerfile: build/ubuntu20-puppet6/Dockerfile.kitchen
-      run_command: /sbin/init
-      volume:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    provisioner:
-      puppetfile_path: build/ubuntu20-puppet6/Puppetfile
+  # TODO: Uncomment after stable 3.5 has been released for focal
+  # # Ubuntu Focal with Systemd - Puppet 6
+  # - name: ubuntu20-puppet6
+  #   driver:
+  #     platform: ubuntu
+  #     dockerfile: build/ubuntu20-puppet6/Dockerfile.kitchen
+  #     run_command: /sbin/init
+  #     volume:
+  #       - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  #   provisioner:
+  #     puppetfile_path: build/ubuntu20-puppet6/Puppetfile
 
-  # Ubuntu Focal with Systemd - Puppet 7
-  - name: ubuntu20-puppet7
-    driver:
-      platform: ubuntu
-      dockerfile: build/ubuntu20-puppet7/Dockerfile.kitchen
-      run_command: /sbin/init
-      volume:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    provisioner:
-      puppetfile_path: build/ubuntu20-puppet7/Puppetfile
+  # # Ubuntu Focal with Systemd - Puppet 7
+  # - name: ubuntu20-puppet7
+  #   driver:
+  #     platform: ubuntu
+  #     dockerfile: build/ubuntu20-puppet7/Dockerfile.kitchen
+  #     run_command: /sbin/init
+  #     volume:
+  #       - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  #   provisioner:
+  #     puppetfile_path: build/ubuntu20-puppet7/Puppetfile
   
   # Ubuntu Focal with Systemd - Puppet 7 - Unstable repo
   - name: ubuntu20-puppet7-unstable

From 17cd73b4e52892b7e83b1f65385d59167da54589 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 30 Jun 2021 10:52:24 +0200
Subject: [PATCH 10/27] change tests back to stable repo, remove unstable ci
 refs

---
 .github/workflows/build.yaml | 11 ++------
 .kitchen.yml                 | 51 +++++-------------------------------
 2 files changed, 9 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d422fe8c..450209db 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -122,8 +122,6 @@ jobs:
             name: 'centos7-puppet7'
           - ruby: '2.7'
             name: 'centos7-puppet7-python36'
-          - ruby: '2.7'
-            name: 'centos7-puppet7-unstable'
           - ruby: '2.7'
             name: 'ubuntu18-puppet6'
           - ruby: '2.7'
@@ -131,14 +129,9 @@ jobs:
           - ruby: '2.7'
             name: 'ubuntu18-puppet7-python36'
           - ruby: '2.7'
-            name: 'ubuntu18-puppet7-unstable'
-          # TODO: Uncomment after st2 3.5 packages are available for focal
-          # - ruby: '2.7'
-          #   name: 'ubuntu20-puppet6'
-          # - ruby: '2.7'
-          #   name: 'ubuntu20-puppet7'
+            name: 'ubuntu20-puppet6'
           - ruby: '2.7'
-            name: 'ubuntu20-puppet7-unstable'
+            name: 'ubuntu20-puppet7'
     env:
       CHECK: '${{ matrix.check }}'
     steps:
diff --git a/.kitchen.yml b/.kitchen.yml
index f43472b3..5efbf95a 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -73,18 +73,6 @@ platforms:
       puppetfile_path: build/centos7-puppet7/Puppetfile
       manifest: test/fullinstall_python36.pp
 
-  # CentOS7 with Systemd - Puppet 7 - Unstable
-  - name: centos7-puppet7-unstable
-    driver:
-      platform: centos
-      dockerfile: build/centos7-puppet7/Dockerfile.kitchen
-      run_command: /sbin/init
-      volume:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    provisioner:
-      puppetfile_path: build/centos7-puppet7/Puppetfile
-      manifest: test/fullinstall_unstable.pp
-
   # Ubuntu Bionic with Systemd - Puppet 6
   - name: ubuntu18-puppet6
     driver:
@@ -118,44 +106,20 @@ platforms:
     provisioner:
       puppetfile_path: build/ubuntu18-puppet7/Puppetfile
       manifest: test/fullinstall_python36.pp
-      
-  # Ubuntu Focal with Systemd - Puppet 7 - Unstable repo
-  - name: ubuntu18-puppet7-unstable
+
+  # Ubuntu Focal with Systemd - Puppet 6
+  - name: ubuntu20-puppet6
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu18-puppet7/Dockerfile.kitchen
+      dockerfile: build/ubuntu20-puppet6/Dockerfile.kitchen
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu18-puppet7/Puppetfile
-      manifest: test/fullinstall_unstable.pp
-
-  # TODO: Uncomment after stable 3.5 has been released for focal
-  # # Ubuntu Focal with Systemd - Puppet 6
-  # - name: ubuntu20-puppet6
-  #   driver:
-  #     platform: ubuntu
-  #     dockerfile: build/ubuntu20-puppet6/Dockerfile.kitchen
-  #     run_command: /sbin/init
-  #     volume:
-  #       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  #   provisioner:
-  #     puppetfile_path: build/ubuntu20-puppet6/Puppetfile
+      puppetfile_path: build/ubuntu20-puppet6/Puppetfile
 
-  # # Ubuntu Focal with Systemd - Puppet 7
-  # - name: ubuntu20-puppet7
-  #   driver:
-  #     platform: ubuntu
-  #     dockerfile: build/ubuntu20-puppet7/Dockerfile.kitchen
-  #     run_command: /sbin/init
-  #     volume:
-  #       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  #   provisioner:
-  #     puppetfile_path: build/ubuntu20-puppet7/Puppetfile
-  
-  # Ubuntu Focal with Systemd - Puppet 7 - Unstable repo
-  - name: ubuntu20-puppet7-unstable
+  # Ubuntu Focal with Systemd - Puppet 7
+  - name: ubuntu20-puppet7
     driver:
       platform: ubuntu
       dockerfile: build/ubuntu20-puppet7/Dockerfile.kitchen
@@ -164,7 +128,6 @@ platforms:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
       puppetfile_path: build/ubuntu20-puppet7/Puppetfile
-      manifest: test/fullinstall_unstable.pp
 
 suites:
   - name: default

From 2975b182d3d557832083090f65967513c0f70a5b Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 30 Jun 2021 10:57:31 +0200
Subject: [PATCH 11/27] install mongo 4.4 only on focal

---
 manifests/profile/mongodb.pp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/manifests/profile/mongodb.pp b/manifests/profile/mongodb.pp
index 21783437..048c0b5d 100644
--- a/manifests/profile/mongodb.pp
+++ b/manifests/profile/mongodb.pp
@@ -39,14 +39,10 @@
   $manage_repo = $st2::mongodb_manage_repo,
   $auth        = $st2::mongodb_auth,
 ) inherits st2 {
-  # if the StackStorm version is > 3.4.0 then MongoDB 4.4
   # if the StackStorm version is > 3.3.0 then MongoDB 4.0
   # if the StackStorm version is > 2.4.0 then MongoDB 3.4
   # else use MongoDB 3.2
-  if st2::version_ge('3.5.0') {
-    $_mongodb_version_default = '4.4'
-  }
-  elsif st2::version_ge('3.3.0') {
+  if st2::version_ge('3.3.0') {
     $_mongodb_version_default = '4.0'
   }
   elsif st2::version_ge('2.4.0') {
@@ -56,6 +52,12 @@
     $_mongodb_version_default = '3.2'
   }
 
+
+  # if Ubuntu is 20.04 then MongoDB 4.4
+  if facts['os']['family'] == 'Debian' and facts['os']['distro']['release']['major'] == '20' {
+    $_mongodb_version_default = '4.4'
+  }
+
   # if user specified a version of MongoDB they want to use, then use that
   # otherwise use the default version of mongo based off the StackStorm version
   $_mongodb_version = $version ? {

From 635e4d366f77b201e70cd0d6a34c5b5dc6aa8cdc Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 30 Jun 2021 10:59:01 +0200
Subject: [PATCH 12/27] update nodejs version to v14 for st2 >= 3.5

---
 manifests/profile/nodejs.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/profile/nodejs.pp b/manifests/profile/nodejs.pp
index 923c3938..9279fe70 100644
--- a/manifests/profile/nodejs.pp
+++ b/manifests/profile/nodejs.pp
@@ -22,10 +22,14 @@
   $version     = $::st2::nodejs_version,
 ) inherits st2 {
 
+  # if the StackStorm version is >=3.5.0 then use NodeJS 14.x
   # if the StackStorm version is >= 2.10.0 then use NodeJS 10.x
   # if the StackStorm version is 2.10.0 < and >= 2.4.0 then use NodeJS 6.x
   # else use NodeJS 4.x
-  if st2::version_ge('2.10.0') {
+  if st2::version_ge('3.5.0') {
+    $nodejs_version_default = '14.x'
+  }
+  elsif st2::version_ge('2.10.0') {
     $nodejs_version_default = '10.x'
   }
   elsif st2::version_ge('2.4.0') {

From 6fae9a33ef41cb06c35ca7eb6ef7ae1948b92eca Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 30 Jun 2021 11:09:04 +0200
Subject: [PATCH 13/27] edit vagrant file to add mongodb 4.4 repo apt key

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index 2ec2a855..f21c1248 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -45,6 +45,7 @@
 # vagrant ssh
 # sudo su -
 # vi /etc/puppetlabs/code/modules/mongodb/manifests/repo.pp
+#           '4.4'   => '20691EEC35216C63CAF66CE1656408E390CFB1F5',
 #           '4.2'   => 'E162F504A20CDF15827F718D4B7C549A058F8B6B',
 #           '4.0'   => '9DA31620334BD75D9DCB49F368818C72E52529D4',
 #

From c7adcea9b66ae03af0dd0a97c2ea057ca9118127 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 30 Jun 2021 11:16:43 +0200
Subject: [PATCH 14/27] fix mongodb specs

---
 metadata.json                        | 4 ++--
 spec/classes/profile/mongodb_spec.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/metadata.json b/metadata.json
index 70ad4f1e..b7621673 100644
--- a/metadata.json
+++ b/metadata.json
@@ -88,8 +88,8 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "16.04",
-        "18.04"
+        "18.04",
+        "20.04"
       ]
     }
   ],
diff --git a/spec/classes/profile/mongodb_spec.rb b/spec/classes/profile/mongodb_spec.rb
index 108d2615..1715ac8f 100644
--- a/spec/classes/profile/mongodb_spec.rb
+++ b/spec/classes/profile/mongodb_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'st2::profile::mongodb' do
-  let(:latest_version) { '4.4' }
+  let(:latest_version) { '4.0' }
 
   on_supported_os.each do |os, os_facts|
     let(:facts) { os_facts }

From 6f8de4a3e9ed42a010078333d7e913b2e1078454 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 30 Jun 2021 11:23:34 +0200
Subject: [PATCH 15/27] fix mongodb fact check for u20

---
 manifests/profile/mongodb.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/profile/mongodb.pp b/manifests/profile/mongodb.pp
index 048c0b5d..32f79088 100644
--- a/manifests/profile/mongodb.pp
+++ b/manifests/profile/mongodb.pp
@@ -54,7 +54,7 @@
 
 
   # if Ubuntu is 20.04 then MongoDB 4.4
-  if facts['os']['family'] == 'Debian' and facts['os']['distro']['release']['major'] == '20' {
+  if $facts['os']['family'] == 'Debian' and $facts['os']['distro']['release']['major'] == '20' {
     $_mongodb_version_default = '4.4'
   }
 

From 5981f66b708172509efac6e7049dd099a83ee801 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 30 Jun 2021 15:32:29 +0200
Subject: [PATCH 16/27] update mongo version and test for u20

---
 Vagrantfile                          |  2 +-
 manifests/profile/mongodb.pp         | 12 +++++-------
 manifests/profile/nodejs.pp          |  4 +++-
 spec/classes/profile/mongodb_spec.rb |  4 +++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index f21c1248..fb42585f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -65,8 +65,8 @@ provider   = provider.to_sym
 box        = ENV['BOX'] ? ENV['BOX'] : 'centos/7'
 #box        = ENV['BOX'] ? ENV['BOX'] : 'centos/8stream'
 #box        = ENV['BOX'] ? ENV['BOX'] : 'generic/centos8'
-#box        = ENV['BOX'] ? ENV['BOX'] : 'generic/ubuntu1604'
 #box        = ENV['BOX'] ? ENV['BOX'] : 'generic/ubuntu1804'
+#box        = ENV['BOX'] ? ENV['BOX'] : 'generic/ubuntu2004'
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
diff --git a/manifests/profile/mongodb.pp b/manifests/profile/mongodb.pp
index 32f79088..5c4dc51b 100644
--- a/manifests/profile/mongodb.pp
+++ b/manifests/profile/mongodb.pp
@@ -39,10 +39,14 @@
   $manage_repo = $st2::mongodb_manage_repo,
   $auth        = $st2::mongodb_auth,
 ) inherits st2 {
+  # if Ubuntu is 20.04 then MongoDB 4.4
   # if the StackStorm version is > 3.3.0 then MongoDB 4.0
   # if the StackStorm version is > 2.4.0 then MongoDB 3.4
   # else use MongoDB 3.2
-  if st2::version_ge('3.3.0') {
+  if $facts['os']['family'] == 'Debian' and $facts['os']['release']['major'] == '20.04' and st2::version_ge('3.3.0') {
+    $_mongodb_version_default = '4.4'
+  }
+  elsif st2::version_ge('3.3.0') {
     $_mongodb_version_default = '4.0'
   }
   elsif st2::version_ge('2.4.0') {
@@ -52,12 +56,6 @@
     $_mongodb_version_default = '3.2'
   }
 
-
-  # if Ubuntu is 20.04 then MongoDB 4.4
-  if $facts['os']['family'] == 'Debian' and $facts['os']['distro']['release']['major'] == '20' {
-    $_mongodb_version_default = '4.4'
-  }
-
   # if user specified a version of MongoDB they want to use, then use that
   # otherwise use the default version of mongo based off the StackStorm version
   $_mongodb_version = $version ? {
diff --git a/manifests/profile/nodejs.pp b/manifests/profile/nodejs.pp
index 9279fe70..f0af91de 100644
--- a/manifests/profile/nodejs.pp
+++ b/manifests/profile/nodejs.pp
@@ -22,7 +22,9 @@
   $version     = $::st2::nodejs_version,
 ) inherits st2 {
 
-  # if the StackStorm version is >=3.5.0 then use NodeJS 14.x
+  $use_rhel7_builtin = false
+
+  # if the StackStorm version is >= 3.5.0 then use NodeJS 14.x
   # if the StackStorm version is >= 2.10.0 then use NodeJS 10.x
   # if the StackStorm version is 2.10.0 < and >= 2.4.0 then use NodeJS 6.x
   # else use NodeJS 4.x
diff --git a/spec/classes/profile/mongodb_spec.rb b/spec/classes/profile/mongodb_spec.rb
index 1715ac8f..ae0be02a 100644
--- a/spec/classes/profile/mongodb_spec.rb
+++ b/spec/classes/profile/mongodb_spec.rb
@@ -5,7 +5,9 @@
 
   on_supported_os.each do |os, os_facts|
     let(:facts) { os_facts }
-
+    if os == "ubuntu-20.04-x86_64" {}
+      let(:latest_version) { '4.4' }
+    }
     context "on #{os}" do
       context 'with default options' do
         it { is_expected.to compile.with_all_deps }

From 302a0940e3ba2682ab98a5f12c7eb853e315be40 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 30 Jun 2021 15:34:18 +0200
Subject: [PATCH 17/27] fix brackets

---
 spec/classes/profile/mongodb_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/profile/mongodb_spec.rb b/spec/classes/profile/mongodb_spec.rb
index ae0be02a..e69a45b6 100644
--- a/spec/classes/profile/mongodb_spec.rb
+++ b/spec/classes/profile/mongodb_spec.rb
@@ -5,7 +5,7 @@
 
   on_supported_os.each do |os, os_facts|
     let(:facts) { os_facts }
-    if os == "ubuntu-20.04-x86_64" {}
+    if os == "ubuntu-20.04-x86_64" {
       let(:latest_version) { '4.4' }
     }
     context "on #{os}" do

From a8ed130358fe8b9c51dd0c38aacd0e15cdb715a7 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Wed, 30 Jun 2021 15:45:44 +0200
Subject: [PATCH 18/27] try os conditional with if/end

---
 spec/classes/profile/mongodb_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/classes/profile/mongodb_spec.rb b/spec/classes/profile/mongodb_spec.rb
index e69a45b6..87cfd63b 100644
--- a/spec/classes/profile/mongodb_spec.rb
+++ b/spec/classes/profile/mongodb_spec.rb
@@ -5,9 +5,9 @@
 
   on_supported_os.each do |os, os_facts|
     let(:facts) { os_facts }
-    if os == "ubuntu-20.04-x86_64" {
+    if os == "ubuntu-20.04-x86_64" 
       let(:latest_version) { '4.4' }
-    }
+    end
     context "on #{os}" do
       context 'with default options' do
         it { is_expected.to compile.with_all_deps }

From cb4adb2d80ab0c2922c613a1c95e482d7ff496f3 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Mon, 13 Sep 2021 22:38:37 +0200
Subject: [PATCH 19/27] try if-else for mongodb logic

---
 spec/classes/profile/mongodb_spec.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/spec/classes/profile/mongodb_spec.rb b/spec/classes/profile/mongodb_spec.rb
index 87cfd63b..98d253e6 100644
--- a/spec/classes/profile/mongodb_spec.rb
+++ b/spec/classes/profile/mongodb_spec.rb
@@ -1,12 +1,17 @@
 require 'spec_helper'
 
 describe 'st2::profile::mongodb' do
-  let(:latest_version) { '4.0' }
+  # let(:latest_version) { '4.0' }
 
   on_supported_os.each do |os, os_facts|
     let(:facts) { os_facts }
-    if os == "ubuntu-20.04-x86_64" 
+
+    if os == "ubuntu-20.04-x86_64"
       let(:latest_version) { '4.4' }
+
+    else
+      let(:latest_version) { '4.0' }
+
     end
     context "on #{os}" do
       context 'with default options' do

From abb094c1d97fa3430259eff059e2a163948a5c23 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Tue, 14 Sep 2021 10:03:47 +0200
Subject: [PATCH 20/27] fix typo

---
 build/scripts/install_puppet.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/scripts/install_puppet.sh b/build/scripts/install_puppet.sh
index e3c4a8cc..53603f74 100755
--- a/build/scripts/install_puppet.sh
+++ b/build/scripts/install_puppet.sh
@@ -12,7 +12,7 @@ sudo yum -y install git
 # Install puppet module dependencies
 sudo -i bash -c "pushd /vagrant/build/centos7-puppet6 && /opt/puppetlabs/puppet/bin/librarian-puppet install --verbose --path=/etc/puppetlabs/code/modules"
 
-# Create symlink for the st2/ puppet module in the Pupept code directory.
+# Create symlink for the st2/ puppet module in the Puppet code directory.
 # This allows us to make changes locally, outside of the VM then automatically available
 # within the VM so you can run `puppet agent -t` and it will just work!
 #

From d9a9b07366ef4bae8a43cb146c1a9ce346df7fe2 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Tue, 14 Sep 2021 11:42:31 +0200
Subject: [PATCH 21/27] fix tests for u20

---
 spec/classes/profile/mongodb_spec.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/spec/classes/profile/mongodb_spec.rb b/spec/classes/profile/mongodb_spec.rb
index 98d253e6..487cb7e4 100644
--- a/spec/classes/profile/mongodb_spec.rb
+++ b/spec/classes/profile/mongodb_spec.rb
@@ -44,13 +44,23 @@
 
       context 'with st2_version == 3.3.0' do
         let(:facts) { os_facts.merge('st2_version' => '3.3.0') }
-
+        
         it do
-          is_expected.to contain_class('mongodb::globals')
+          if os == "ubuntu-20.04-x86_64"
+            is_expected.to contain_class('mongodb::globals')
+            .with('manage_package' => true,
+                  'manage_package_repo' => true,
+                  'version' => '4.4',
+                  'manage_pidfile' => false)
+      
+          else
+            is_expected.to contain_class('mongodb::globals')
             .with('manage_package' => true,
                   'manage_package_repo' => true,
                   'version' => '4.0',
                   'manage_pidfile' => false)
+      
+          end
         end
       end
 

From 9a5e70aaaf642eb1a88cbf07cdb6b83967e30e95 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Tue, 14 Sep 2021 12:03:04 +0200
Subject: [PATCH 22/27] fix rubocop offenses

---
 spec/classes/profile/mongodb_spec.rb | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/spec/classes/profile/mongodb_spec.rb b/spec/classes/profile/mongodb_spec.rb
index 487cb7e4..d1d07a0d 100644
--- a/spec/classes/profile/mongodb_spec.rb
+++ b/spec/classes/profile/mongodb_spec.rb
@@ -6,7 +6,7 @@
   on_supported_os.each do |os, os_facts|
     let(:facts) { os_facts }
 
-    if os == "ubuntu-20.04-x86_64"
+    if os == 'ubuntu-20.04-x86_64'
       let(:latest_version) { '4.4' }
 
     else
@@ -46,20 +46,18 @@
         let(:facts) { os_facts.merge('st2_version' => '3.3.0') }
         
         it do
-          if os == "ubuntu-20.04-x86_64"
+          if os == 'ubuntu-20.04-x86_64'
             is_expected.to contain_class('mongodb::globals')
-            .with('manage_package' => true,
-                  'manage_package_repo' => true,
-                  'version' => '4.4',
-                  'manage_pidfile' => false)
-      
+              .with('manage_package' => true,
+                    'manage_package_repo' => true,
+                    'version' => '4.4',
+                    'manage_pidfile' => false)
           else
             is_expected.to contain_class('mongodb::globals')
-            .with('manage_package' => true,
-                  'manage_package_repo' => true,
-                  'version' => '4.0',
-                  'manage_pidfile' => false)
-      
+              .with('manage_package' => true,
+                    'manage_package_repo' => true,
+                    'version' => '4.0',
+                    'manage_pidfile' => false)
           end
         end
       end

From c6c3cdac4c2afd3de7702d8be14a6c9fa6da7db9 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Tue, 14 Sep 2021 13:46:08 +0200
Subject: [PATCH 23/27] fix rubocop offense

---
 spec/classes/profile/mongodb_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/classes/profile/mongodb_spec.rb b/spec/classes/profile/mongodb_spec.rb
index d1d07a0d..fa3d2f06 100644
--- a/spec/classes/profile/mongodb_spec.rb
+++ b/spec/classes/profile/mongodb_spec.rb
@@ -44,7 +44,7 @@
 
       context 'with st2_version == 3.3.0' do
         let(:facts) { os_facts.merge('st2_version' => '3.3.0') }
-        
+
         it do
           if os == 'ubuntu-20.04-x86_64'
             is_expected.to contain_class('mongodb::globals')

From 78d505296fd1036b6bfa63bd02aefb3cb24cd7c9 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Tue, 14 Sep 2021 13:56:45 +0200
Subject: [PATCH 24/27] cleanup old code

---
 spec/classes/profile/mongodb_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/classes/profile/mongodb_spec.rb b/spec/classes/profile/mongodb_spec.rb
index fa3d2f06..cf75da82 100644
--- a/spec/classes/profile/mongodb_spec.rb
+++ b/spec/classes/profile/mongodb_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'st2::profile::mongodb' do
-  # let(:latest_version) { '4.0' }
-
   on_supported_os.each do |os, os_facts|
     let(:facts) { os_facts }
 

From 03f6055a06607acd65e992abbb9dea3a856568a1 Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Tue, 14 Sep 2021 17:44:17 +0200
Subject: [PATCH 25/27] fix r10k version to 3.9 to prevent
 https://github.com/puppetlabs/r10k/issues/1188

---
 build/kitchen/Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/kitchen/Gemfile b/build/kitchen/Gemfile
index 3bb16114..12b78c4b 100644
--- a/build/kitchen/Gemfile
+++ b/build/kitchen/Gemfile
@@ -14,7 +14,7 @@ gem 'mixlib-shellout'
 gem 'nokogiri'
 gem 'public_suffix'
 gem 'puppet'
-gem 'r10k'
+gem 'r10k', '~> 3.9.0'
 gem 'semverse'
 gem 'test-kitchen'
 # hard code to 3.2.0 because sudo bugs: https://github.com/inspec/train/issues/548

From 69beb99ef74da021cfd6b6a0aa528fbb43c7cbeb Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Tue, 14 Sep 2021 17:50:19 +0200
Subject: [PATCH 26/27] don't let rabbitmq manage python versions

---
 manifests/profile/rabbitmq.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/profile/rabbitmq.pp b/manifests/profile/rabbitmq.pp
index 3cb2f6a1..3e312184 100644
--- a/manifests/profile/rabbitmq.pp
+++ b/manifests/profile/rabbitmq.pp
@@ -61,6 +61,7 @@
     environment_variables => {
       'RABBITMQ_NODE_IP_ADDRESS' => $::st2::rabbitmq_bind_ip,
     },
+    manage_python         => false,
   }
   contain 'rabbitmq'
 

From 72c21c4ef6271fb69e1e052a94e7275362c57dea Mon Sep 17 00:00:00 2001
From: Ankur Singh <ankur.singh@cern.ch>
Date: Tue, 14 Sep 2021 18:38:39 +0200
Subject: [PATCH 27/27] add software-properties-common in ubuntu images for
 apt-add-repo

---
 build/ubuntu18-puppet6/Dockerfile.kitchen | 3 +++
 build/ubuntu18-puppet7/Dockerfile.kitchen | 3 +++
 build/ubuntu20-puppet6/Dockerfile.kitchen | 3 +++
 build/ubuntu20-puppet7/Dockerfile.kitchen | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/build/ubuntu18-puppet6/Dockerfile.kitchen b/build/ubuntu18-puppet6/Dockerfile.kitchen
index 967f0074..2d30e34c 100644
--- a/build/ubuntu18-puppet6/Dockerfile.kitchen
+++ b/build/ubuntu18-puppet6/Dockerfile.kitchen
@@ -18,6 +18,9 @@ RUN echo '<%= IO.read(@public_key).strip %>' >> /home/<%= @username %>/.ssh/auth
 # update OS
 RUN sudo apt-get -y update
 
+# Install utilities to add apt repos
+RUN sudo apt-get -y install software-properties-common
+
 # install puppet
 # https://puppet.com/docs/puppet/6.0/puppet_platform.html
 RUN wget https://apt.puppetlabs.com/puppet6-release-bionic.deb
diff --git a/build/ubuntu18-puppet7/Dockerfile.kitchen b/build/ubuntu18-puppet7/Dockerfile.kitchen
index a21d7a71..19d914e7 100644
--- a/build/ubuntu18-puppet7/Dockerfile.kitchen
+++ b/build/ubuntu18-puppet7/Dockerfile.kitchen
@@ -18,6 +18,9 @@ RUN echo '<%= IO.read(@public_key).strip %>' >> /home/<%= @username %>/.ssh/auth
 # update OS
 RUN sudo apt-get -y update
 
+# Install utilities to add apt repos
+RUN sudo apt-get -y install software-properties-common
+
 # install puppet
 # https://puppet.com/docs/puppet/7.0/puppet_platform.html
 RUN wget https://apt.puppetlabs.com/puppet7-release-bionic.deb
diff --git a/build/ubuntu20-puppet6/Dockerfile.kitchen b/build/ubuntu20-puppet6/Dockerfile.kitchen
index d39390fb..d6f17795 100644
--- a/build/ubuntu20-puppet6/Dockerfile.kitchen
+++ b/build/ubuntu20-puppet6/Dockerfile.kitchen
@@ -18,6 +18,9 @@ RUN echo '<%= IO.read(@public_key).strip %>' >> /home/<%= @username %>/.ssh/auth
 # update OS
 RUN sudo apt-get -y update
 
+# Install utilities to add apt repos
+RUN sudo apt-get -y install software-properties-common
+
 # install puppet
 # https://puppet.com/docs/puppet/6.0/puppet_platform.html
 RUN wget https://apt.puppetlabs.com/puppet6-release-focal.deb
diff --git a/build/ubuntu20-puppet7/Dockerfile.kitchen b/build/ubuntu20-puppet7/Dockerfile.kitchen
index c1d783e0..85e66231 100644
--- a/build/ubuntu20-puppet7/Dockerfile.kitchen
+++ b/build/ubuntu20-puppet7/Dockerfile.kitchen
@@ -18,6 +18,9 @@ RUN echo '<%= IO.read(@public_key).strip %>' >> /home/<%= @username %>/.ssh/auth
 # update OS
 RUN sudo apt-get -y update
 
+# Install utilities to add apt repos
+RUN sudo apt-get -y install software-properties-common
+
 # install puppet
 # https://puppet.com/docs/puppet/7.0/puppet_platform.html
 RUN wget https://apt.puppetlabs.com/puppet7-release-focal.deb