Updates for 8.11.0

Default to 8.11.0

Fix sles Dockerfile for installs

Fix sles release package installation

Author: joshcooper

docker/bin/helpers/run-install.sh

@@ -2,7 +2,11 @@
 
 set -e
 
-to_version=${1:-8.10.0}
+to_version="${1}"
+if [[ -z "${to_version}" ]]; then
+    echo "$0: The version to install must be passed as an argument"
+    exit 1
+fi
 puppet_version=( ${to_version//./ } )
 puppet_major=${puppet_version[0]}
 case $puppet_major in
@@ -13,16 +17,27 @@ case $puppet_major in
         to_collection=puppet8
         ;;
     *)
-        echo "Invalid version supplied" 1>&2
+        echo "$0: Invalid version supplied" 1>&2
         exit 1
 esac
 
 export PT__installdir=../
 export PT_version=${to_version}
+export PT_collection=${to_collection}
 export PT_password=${PUPPET_FORGE_TOKEN}
 chmod u+x tasks/install_shell.sh
 tasks/install_shell.sh
 
 echo "puppet $(/opt/puppetlabs/puppet/bin/puppet --version)"
 echo "facter $(/opt/puppetlabs/puppet/bin/facter --version)"
 /opt/puppetlabs/puppet/bin/puppet apply -e 'notice("puppet apply")'
+
+# Make e.g. `puppet --version` work out of the box.
+PATH=/opt/puppetlabs/bin:$PATH \
+    read -p "Explore the container? [y/N]: " choice && \
+    choice=${choice:-N} && \
+    if [ "${choice}" = "y" ]; then \
+        bash; \
+    else \
+        echo "Moving on..."; \
+    fi

docker/bin/install.sh

@@ -19,45 +19,56 @@
 #          Default: 8.1.0
 set -e
 
-if [ -z "${PUPPET_FORGE_TOKEN}" ]; then
-    echo "Environment variable PUPPET_FORGE_TOKEN must be set"
+if [[ -z "${PUPPET_FORGE_TOKEN}" ]]; then
+    echo "$0: Environment variable PUPPET_FORGE_TOKEN must be set"
     exit 1
 fi
 
 cd "$(dirname "$0")/../.."
 platforms=${1:-rocky}
-version=${2:-8.10.0}
+version=${2:-8.11.0}
 for platform in ${platforms//,/ }
 do
+    dockerfile='docker/install/dnf/Dockerfile'
+
     case $platform in
-        amazon)
+        amazon*)
             base_image='amazonlinux:2023'
             ;;
 
-        fedora)
+        fedora40)
             base_image='fedora:40'
             ;;
 
-        rocky)
+        fedora36)
+            base_image='fedora:36'
+            ;;
+
+        fedora*)
+            base_image='fedora:41'
+            ;;
+
+        rocky8)
             base_image='rockylinux/rockylinux:8'
             ;;
 
-        sles)
-            docker build --rm -f docker/sles/Dockerfile . -t pa-dev:$platform.install \
-                   --build-arg version=${version}
-            docker run -e PUPPET_FORGE_TOKEN --rm -ti pa-dev:$platform.install
-            exit 0
+        rocky*)
+            base_image='rockylinux/rockylinux:9'
+            ;;
+
+        sles*)
+            base_image='registry.suse.com/suse/sle15:15.6'
+            dockerfile='docker/install/sles/Dockerfile'
             ;;
 
         *)
-            echo "$0: Usage install.sh [amazon|fedora|rocky]"
+            echo "$0: Usage install.sh [amazon|fedora|rocky|sles]"
             exit 1
             ;;
     esac
 
-    docker build --rm -f docker/install/dnf/Dockerfile . -t pa-dev:$platform.install \
-           --build-arg version=${version} \
-           --build-arg BASE_IMAGE=${base_image}
-    docker run -e PUPPET_FORGE_TOKEN --rm -ti pa-dev:$platform.install
+    docker build --rm -f "${dockerfile}" . -t pa-dev:$platform.install \
+           --build-arg BASE_IMAGE="${base_image}"
+    docker run -e PUPPET_FORGE_TOKEN --rm -ti pa-dev:$platform.install "${version}"
 done
 echo Complete

docker/install/dnf/Dockerfile

@@ -14,11 +14,6 @@
 # ========================================================================================================================================
 # Installing:
 #  puppet-agent                     x86_64                     8.10.0-1.el8                             puppet8                      27 M
-#
-# This specifies the versions that were used for upgrade.
-#
-# Arguments:
-# - before: The version to do upgrade FROM. Default: "7.34.0"
 
 ARG BASE_IMAGE=rocky:8
 FROM ${BASE_IMAGE}

docker/install/sles/Dockerfile

@@ -0,0 +1,50 @@
+# This Dockerfile enables an iterative development workflow where you can make
+# a change and test it out quickly. The majority of commands in this file will
+# be cached, making the feedback loop typically quite short. The workflow is
+# as follows:
+#   1. Set up pre-conditions for the system in puppet code using `deploy.pp`.
+#   2. Make a change to the module.
+#   3. Run `./docker/bin/install.sh rocky` from the project directory.
+#   4. Review the output. Repeat steps 2-3 as needed.
+#
+# At the end of execution, you will see a line like:
+#
+# (19/19) Installing: puppet-agent-8.11.0-1.sles15.x86_64 ..........................................................................[done]
+
+ARG BASE_IMAGE=registry.suse.com/suse/sle15:15.6
+FROM ${BASE_IMAGE}
+
+# Use this to force a cache reset (e.g. for output purposes)
+#COPY $0 /tmp/Dockerfile
+
+# Install some other dependencies for ease of life.
+RUN zypper install --no-confirm wget git-core
+
+# This is also duplicated in the docker/bin/helpers/run-upgrade.sh.
+ENV module_path=/tmp/modules
+WORKDIR "${module_path}/puppet_agent"
+COPY metadata.json ./
+
+# Installing dependencies from source. These versions should be within the range
+# of `dependencies` in metadata.json.
+RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-stdlib ../stdlib --branch v9.7.0
+RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-inifile ../inifile --branch v6.2.0
+RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-apt ../apt --branch v10.0.1
+RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-facts ../facts --branch 1.7.0
+
+# Now move the project directory's files into the image. That way, if these
+# files change, caching will skip everything before this.
+COPY docker/bin/helpers/run-install.sh /tmp/bin/run-install.sh
+COPY files/ ./files/
+COPY locales/ ./locales/
+COPY spec/ ./spec/
+COPY task_spec/  ./task_spec/
+COPY tasks/ ./tasks/
+COPY templates/ ./templates
+COPY types/ ./types/
+COPY Gemfile Gemfile.lock Rakefile ./
+COPY lib/ ./lib/
+COPY manifests/ ./manifests/
+
+# Perform the install.
+ENTRYPOINT ["/tmp/bin/run-install.sh"]

tasks/install_shell.sh

@@ -597,8 +597,8 @@ install_file() {
       fi
 
       rpm -Uvh --oldpackage --replacepkgs "$2"
-      sed -i "s/^#\?username=.*/username=${username}/" "/etc/yum.repos.d/puppet8-release.repo"
-      sed -i "s/^#\?password=.*/password=${password}/" "/etc/yum.repos.d/puppet8-release.repo"
+      sed -i "s/^#\?username=.*/username=${username}/" "/etc/yum.repos.d/${collection}-release.repo"
+      sed -i "s/^#\?password=.*/password=${password}/" "/etc/yum.repos.d/${collection}-release.repo"
       exists dnf && PKGCMD=dnf || PKGCMD=yum
       if test "$version" = 'latest'; then
         run_cmd "${PKGCMD} install -y puppet-agent && ${PKGCMD} upgrade -y puppet-agent"
@@ -622,7 +622,8 @@ install_file() {
         fi
       fi
 
-      sed -i 's/^baseurl/baseurl=https:\/\/${username}:${password}@yum-puppetcore.puppet.com\/puppet8\/sles\/\$basearch?auth=basic' "/etc/zypp/repos.d/puppet8-release.repo"
+      run_cmd "zypper install --no-confirm '$2'"
+      sed -i -E "s/^baseurl=https:\/\/.*yum-puppetcore.puppet.com(.*)/baseurl=https:\/\/${username}:${password}@yum-puppetcore.puppet.com\\1/" "/etc/zypp/repos.d/${collection}-release.repo"
       if test "$version" = "latest"; then
         run_cmd "zypper install --no-confirm 'puppet-agent'"
       else