Merge branch 'master' into release/v2.0.0

Author: nmaludy

build/centos7-puppet7/Dockerfile

@@ -1,5 +1,5 @@
 # usage (from the root of the puppet-st2/ directory):
-# docker build -t stackstorm/puppet-st2-puppet6 -f build/puppet6/Dockerfile .
+# docker build -t stackstorm/puppet-st2-puppet7 -f build/puppet7/Dockerfile .
 
 FROM stackstorm/packagingtest:centos7-systemd
 
@@ -30,7 +30,7 @@ WORKDIR $APP_HOME
 COPY . $APP_HOME
 
 # use bundler to install our gems
-ENV PUPPET_GEM_VERSION "~> 6.0"
+ENV PUPPET_GEM_VERSION "~> 7.0"
 ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
   BUNDLE_JOBS=2 \
   BUNDLE_PATH=/bundle

build/centos7-puppet7/Dockerfile.kitchen

@@ -1,5 +1,5 @@
 # usage (from the root of the puppet-st2/ directory):
-# docker build -t stackstorm/puppet-st2-puppet6 -f build/puppet6/Dockerfile.kitchen .
+# docker build -t stackstorm/puppet-st2-puppet7 -f build/puppet7/Dockerfile.kitchen .
 
 FROM stackstorm/packagingtest:centos7-systemd
 
@@ -32,6 +32,6 @@ RUN ln -s /opt/puppetlabs/bin/hiera /usr/bin/
 RUN ln -s /opt/puppetlabs/bin/mco /usr/bin/
 RUN ln -s /opt/puppetlabs/bin/puppet /usr/bin/
 
-# print versions (ruby 2.5.x, puppet 6.x)
+# print versions (ruby 2.5.x, puppet 7.x)
 RUN puppet --version
 RUN sudo -E puppet --version

build/ubuntu18-puppet7/Dockerfile.kitchen

@@ -1,5 +1,5 @@
 # usage (from the root of the puppet-st2/ directory):
-# docker build -t stackstorm/puppet-st2-ubuntu18-puppet7 -f build/ubuntu18-puppet6/Dockerfile.kitchen .
+# docker build -t stackstorm/puppet-st2-ubuntu18-puppet7 -f build/ubuntu18-puppet7/Dockerfile.kitchen .
 
 FROM stackstorm/packagingtest:bionic-systemd