[terraform-agent-2408, inf-terraform-[aws|azure]] feature/version bump 202408

.github/workflows/continuous-integration-workflow.yml

@@ -158,6 +158,19 @@ jobs:
         run: |
           docker build --tag agent-terraform-2306-test-ubi8 --file Dockerfile.ubi8 .
 
+  jenkins-agent-terraform-2408-ubi8:
+    name: Jenkins agent Terraform 2408 (UBI8)
+    runs-on: ubuntu-22.04
+    steps:
+      -
+        name: Checkout repository
+        uses: actions/checkout@v4.1.6
+      -
+        name: Build docker image
+        working-directory: common/jenkins-agents/terraform-2408/docker
+        run: |
+          docker build --tag agent-terraform-2408-test-ubi8 --file Dockerfile.ubi8 .
+
   jenkins-agent-scala-ubi8:
     name: Jenkins agent Scala (UBI8)
     runs-on: ubuntu-22.04

CHANGELOG.md

@@ -23,6 +23,9 @@
 - Add microsoft-edge to nodejs agents for using with cypress ([#1063](https://github.com/opendevstack/ods-quickstarters/pull/1063))
 - Replaced centos8 repository for AlmaLinux 8 due to deprecation ([#1063](https://github.com/opendevstack/ods-quickstarters/pull/1063))
 - Improvements in the reporter for cypress ([#1042](https://github.com/opendevstack/ods-quickstarters/issues/1042))
+- inf-terraform-[aws|azure]: bump terraform versions, pre-commit-hooks, library versions ([#1036](https://github.com/opendevstack/ods-quickstarters/pull/1036))
+- jenkins-agent-terraform-2408: add jenkins agent terraform-2408, add go-task, go for experimental terratest, add python-3.12 (drop python-3.8), use tenv for terraform (tofu) version management, ruby version 3.3.4, terraform 1.9.4 ([#1036](https://github.com/opendevstack/ods-quickstarters/pull/1036))
+- Replaced centos8 repository for RockyLinux 8 due to deprecation in terraform agents ([#1067](https://github.com/opendevstack/ods-quickstarters/pull/1036))
 
 ### Added
 
@@ -467,4 +470,4 @@
 
 ## [0.1.0 ods-project-quickstarters] - 2018-07-27
 
-Initial release.
+Initial release.

CODEOWNERS

@@ -14,8 +14,8 @@
 /e2e-spock-geb/ @metmajer @garcanam @roicarrera
 /fe-angular/ @cschweikert
 /fe-ionic/ @rianet @bljubisic
-/inf-terraform-aws/ @frankjoas @metmajer @nichtraunzer @tbugfinder
-/inf-terraform-azure/ @frankjoas @metmajer @nichtraunzer @tbugfinder
+/inf-terraform-aws/ @terra-naut @tbugfinder
+/inf-terraform-azure/ @terra-naut @tbugfinder
 /ods-document-gen-svc/ @metmajer
 /ods-provisioning-app/ @clemensutschig @michaelsauter
 /release-manager/ @metmajer @michaelsauter

Makefile

@@ -8,15 +8,15 @@ ODS_NAMESPACE := $(shell grep ODS_NAMESPACE $(CURDIR)/../ods-configuration/ods-c
 
 # JENKINS AGENT
 ## Install or update Jenkins agent resources.
-install-jenkins-agent: install-jenkins-agent-golang install-jenkins-agent-jdk install-jenkins-agent-nodejs install-jenkins-agent-python install-jenkins-agent-scala install-jenkins-agent-terraform install-jenkins-agent-terraform-2306 install-jenkins-agent-rust
+install-jenkins-agent: install-jenkins-agent-golang install-jenkins-agent-jdk install-jenkins-agent-nodejs install-jenkins-agent-python install-jenkins-agent-scala install-jenkins-agent-terraform install-jenkins-agent-terraform-2306 install-jenkins-agent-terraform-2408 install-jenkins-agent-rust
 .PHONY: install-jenkins-agent
 
 ## Update OpenShift resources related Jenkins agent resources.
-apply-jenkins-agent-build: apply-jenkins-agent-golang-build apply-jenkins-agent-jdk-build apply-jenkins-agent-nodejs16-build apply-jenkins-agent-nodejs18-build apply-jenkins-agent-nodejs20-build apply-jenkins-agent-nodejs22-build apply-jenkins-agent-python-build apply-jenkins-agent-scala-build apply-jenkins-agent-terraform-build apply-jenkins-agent-terraform-build-2306 apply-jenkins-agent-rust-build
+apply-jenkins-agent-build: apply-jenkins-agent-golang-build apply-jenkins-agent-jdk-build apply-jenkins-agent-nodejs16-build apply-jenkins-agent-nodejs18-build apply-jenkins-agent-nodejs20-build apply-jenkins-agent-nodejs22-build apply-jenkins-agent-python-build apply-jenkins-agent-scala-build apply-jenkins-agent-terraform-build apply-jenkins-agent-terraform-build-2306 apply-jenkins-agent-terraform-build-2408 apply-jenkins-agent-rust-build
 .PHONY: apply-jenkins-agent-build
 
 ## Start builds of Jenkins agents.
-start-jenkins-agent-build: start-jenkins-agent-golang-build start-jenkins-agent-jdk-build start-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs18-build start-jenkins-agent-nodejs20-build start-jenkins-agent-nodejs22-build start-jenkins-agent-python-build start-jenkins-agent-scala-build start-jenkins-agent-terraform-build start-jenkins-agent-terraform-build-2306 start-jenkins-agent-rust-build
+start-jenkins-agent-build: start-jenkins-agent-golang-build start-jenkins-agent-jdk-build start-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs18-build start-jenkins-agent-nodejs20-build apply-jenkins-agent-nodejs22-build start-jenkins-agent-python-build start-jenkins-agent-scala-build start-jenkins-agent-terraform-build start-jenkins-agent-terraform-build-2306 start-jenkins-agent-terraform-build-2408 start-jenkins-agent-rust-build
 .PHONY: start-jenkins-agent-build
 
 
@@ -177,6 +177,22 @@ start-jenkins-agent-terraform-build-2306:
 .PHONY: start-jenkins-agent-terraform-build-2306
 
 
+# JENKINS AGENT TERRAFORM-2408
+## Install or update Jenkins Terraform agent resources.
+install-jenkins-agent-terraform-2408: apply-jenkins-agent-terraform-build-2408 start-jenkins-agent-terraform-build-2408
+.PHONY: install-jenkins-agent-terraform-2408
+
+## Update OpenShift resources related to Jenkins Terraform agent image 2408.
+apply-jenkins-agent-terraform-build-2408:
+	cd common/jenkins-agents/terraform-2408/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
+.PHONY: apply-jenkins-agent-terraform-build-2408
+
+## Start build of BuildConfig "jenkins-agent-terraform-2408".
+start-jenkins-agent-terraform-build-2408:
+	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-terraform-2408 --follow
+.PHONY: start-jenkins-agent-terraform-build-2408
+
+
 # HELP
 # Based on https://gist.github.com/prwhite/8168133#gistcomment-2278355.
 help:

common/jenkins-agents/README.md

@@ -25,6 +25,7 @@ The ODS [jenkins shared library](https://github.com/opendevstack/ods-jenkins-sha
 8. [Scala & SBT](scala)
 9. [Terraform](terraform)
 10. [Terraform 2306](terraform-2306)
+11. [Terraform 2408](terraform-2408)
 
 ## OCP Config / Installation
 

common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi8

@@ -22,7 +22,6 @@ ENV TERRAFORM_VERSION=1.4.6 \
     TFLINT_VERSION=0.46.1 \
     NODEJS_VERSION=18.16.0 \
     BUNDLER_VERSION=2.4.13 \
-    SOPS_VERSION=3.7.3 \
     AGE_VERSION=1.1.1 \
     GEM_HOME=/opt/bundle \
     RBENV_ROOT=/opt/rbenv \
@@ -34,7 +33,7 @@ ENV INSTALL_PKGS="yum-utils gcc make git-core zlib zlib-devel gcc-c++ patch \
     python3.11 python3.11-pip python3.11-setuptools \
     readline \
     libffi-devel libyaml-devel openssl-devel make bzip2 autoconf curl sqlite-devel xz"
-ENV INSTALL_CENTOS_PKGS="readline-devel bison automake libtool"
+ENV INSTALL_DNF_PKGS="readline-devel bison automake libtool"
 ENV PATH=/opt/tfenv/bin:/opt/rbenv/shims:/opt/rbenv/bin:/opt/node/bin:$PATH
 ENV HOME=/home/jenkins
 
@@ -46,16 +45,15 @@ COPY python_requirements /tmp/requirements.txt
 # COPY certs/* /etc/pki/ca-trust/source/anchors/
 # RUN update-ca-trust force-enable && update-ca-trust extract
 
-COPY yum.repos.d/centos8.repo /etc/yum.repos.d/centos8.repo
+COPY yum.repos.d/rockylinux.repo /etc/yum.repos.d/rockylinux.repo
 RUN sed -i 's@^\s*enabled\s*=.*$@enabled = 1@g' /etc/yum.repos.d/*.repo \
-    && sed -i 's@^\s*enabled\s*=.*$@enabled = 0@g' /etc/yum.repos.d/centos8.repo \
+    && sed -i 's@^\s*enabled\s*=.*$@enabled = 0@g' /etc/yum.repos.d/rockylinux.repo \
     && grep -i '\(name\|enabled\)' /etc/yum.repos.d/*.repo
 
 RUN set -x \
     && dnf -y repolist \
     && dnf -y install $INSTALL_PKGS \
-    && dnf -y install --enablerepo centos-base --enablerepo centos-plus --enablerepo centos-extras \
-                      --enablerepo centos-appstream --enablerepo centos-devel $INSTALL_CENTOS_PKGS
+    && dnf -y install --enablerepo rockylinux-baseos --enablerepo rockylinux-appstream $INSTALL_DNF_PKGS
 
 RUN curl -sSL "https://bootstrap.pypa.io/pip/3.6/get-pip.py" -o "get-pip.py" \
     && python3 get-pip.py
@@ -151,9 +149,8 @@ RUN wget -q "https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CO
     && chmod +x /usr/local/bin/consul \
     && /usr/local/bin/consul -version
 
-# Install mozilla/sops and age
-RUN dnf install -y https://github.com/mozilla/sops/releases/download/v${SOPS_VERSION}/sops-${SOPS_VERSION}-1.x86_64.rpm \
-    && wget -q -O /tmp/age.tar.gz https://github.com/FiloSottile/age/releases/download/v${AGE_VERSION}/age-v${AGE_VERSION}-linux-amd64.tar.gz \
+# Install age
+RUN wget -q -O /tmp/age.tar.gz https://github.com/FiloSottile/age/releases/download/v${AGE_VERSION}/age-v${AGE_VERSION}-linux-amd64.tar.gz \
     && tar xzf /tmp/age.tar.gz -C /usr/local/bin \
     && rm -f /tmp/age.tar.gz
 

common/jenkins-agents/terraform-2306/docker/README.md

@@ -3,7 +3,7 @@
 ## Introduction
 This jenkins agent is used to build and deploy AWS & Azure workloads in the cloud.
 
-The image is built in the global `ods` project and is named `jenkins-agent-terraform`. It can be referenced in a `Jenkinsfile` with `ods/jenkins-agent-terraform`.
+The image is built in the global `ods` project and is named `jenkins-agent-terraform-2306`. It can be referenced in a `Jenkinsfile` with `ods/jenkins-agent-terraform-2306`.
 
 ## Known limitations
-MS Azure support is on the Roadmap.
+N/A

common/jenkins-agents/terraform-2306/docker/yum.repos.d/rockylinux.repo

@@ -0,0 +1,17 @@
+[rockylinux-baseos]
+name=Rocky Linux 8 - BaseOS
+#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=BaseOS-8
+baseurl=https://dl.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/
+gpgcheck=1
+enabled=0
+countme=1
+gpgkey=https://dl.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/RPM-GPG-KEY-rockyofficial
+
+[rockylinux-appstream]
+name=Rocky Linux 8 - AppStream
+#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=AppStream-8
+baseurl=http://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/
+gpgcheck=1
+enabled=0
+countme=1
+gpgkey=https://dl.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/RPM-GPG-KEY-rockyofficial