opendevstack · tbugfinder · May 30, 2023 · May 26, 2023 · May 28, 2023 · May 29, 2023
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
@@ -108,6 +108,19 @@ jobs:
         run: |
           docker build --tag agent-terraform-test-ubi8 --file Dockerfile.ubi8 .
 
+  jenkins-agent-terraform-2306-ubi8:
+    name: Jenkins agent Terraform 2306 (UBI8)
+    runs-on: ubuntu-22.04
+    steps:
+      -
+        name: Checkout repository
+        uses: actions/checkout@v3.5.2
+      -
+        name: Build docker image
+        working-directory: common/jenkins-agents/terraform-2306/docker
+        run: |
+          docker build --tag agent-terraform-2306-test-ubi8 --file Dockerfile.ubi8 .
+
   jenkins-agent-scala-ubi8:
     name: Jenkins agent Scala (UBI8)
     runs-on: ubuntu-22.04

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Scala maintenance ([#879](https://github.com/opendevstack/ods-quickstarters/issues/879))
 - Ionic maintenance ([#899](https://github.com/opendevstack/ods-quickstarters/issues/899))
 - Update of Maven agent, Java and Spock/Geb quickstarter ([#878](https://github.com/opendevstack/ods-quickstarters/issues/878))
+- inf-terraform-[aws|azure], add new jenkins-agent-terraform-2306 with updated tools (ruby 3.2.2, python 3.11, etc.) and dependencies, add tflint, mark other jenkins-agent-terraform as deprecated([#914](https://github.com/opendevstack/ods-quickstarters/issues/914))
 - Update of Python agent, Python, Streamlit and Jupyter quickstarters ([#902](https://github.com/opendevstack/ods-quickstarters/issues/902))
 
 ## [4.1] - 2022-11-17

diff --git a/Makefile b/Makefile
@@ -131,6 +131,22 @@ start-jenkins-agent-terraform-build:
 .PHONY: start-jenkins-agent-terraform-build
 
 
+# JENKINS AGENT TERRAFORM-2306
+## Install or update Jenkins Terraform agent resources.
+install-jenkins-agent-terraform-2306: apply-jenkins-agent-terraform-build-2306 start-jenkins-agent-terraform-build-2306
+.PHONY: install-jenkins-agent-terraform-2306
+
+## Update OpenShift resources related to Jenkins Terraform agent image 2306.
+apply-jenkins-agent-terraform-build-2306:
+	cd common/jenkins-agents/terraform-2306/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
+.PHONY: apply-jenkins-agent-terraform-build-2306
+
+## Start build of BuildConfig "jenkins-agent-terraform-2306".
+start-jenkins-agent-terraform-build-2306:
+	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-terraform-2306 --follow
+.PHONY: start-jenkins-agent-terraform-build-2306
+
+
 # HELP
 # Based on https://gist.github.com/prwhite/8168133#gistcomment-2278355.
 help:

diff --git a/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi8 b/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi8
@@ -0,0 +1,196 @@
+FROM opendevstackorg/ods-jenkins-agent-base-ubi8:latest
+
+LABEL maintainer="Erhard Wais <erhard.wais@boehringer-ingelheim.com>, Frank Joas <frank.joas@boehringer-ingelheim.com>, Josef Hartmann <josef.hartmann@boehringer-ingelheim.com>, Steve Taylor <steve.taylor@boehringer-ingelheim.com>"
+
+# Labels consumed by Red Hat build service
+LABEL com.redhat.component="jenkins-agent-terraform-ubi8-docker" \
+      name="openshift/jenkins-agent-terraform-ubi8" \
+      version="0.1" \
+      architecture="x86_64" \
+      release="1" \
+      io.k8s.display-name="Jenkins Agent Terraform" \
+      io.k8s.description="The jenkins agent image has terraform and other tools on top of the jenkins agent base image." \
+      io.openshift.tags="openshift,jenkins,agent,terraform,aws,azure"
+
+ENV TERRAFORM_VERSION=1.4.6 \
+    TERRAFORM_CONFIG_INSPECT_VERSION=0.2.0 \
+    TERRAFORM_DOCS_VERSION=v0.16.0 \
+    RUBY_VERSION=3.2.2 \
+    PACKER_VERSION=1.8.7 \
+    CONSUL_VERSION=1.15.2 \
+    TFENV_VERSION=3.0.0 \
+    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 \
+    RBENV_SHELL=bash
+
+ENV INSTALL_PKGS="yum-utils gcc make git-core zlib zlib-devel gcc-c++ patch \
+    python38 python38-pip python38-setuptools \
+    python39 python39-pip python39-setuptools \
+    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 PATH=/opt/tfenv/bin:/opt/rbenv/shims:/opt/rbenv/bin:/opt/node/bin:$PATH
+ENV HOME=/home/jenkins
+
+RUN sh -c "rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm || true"
+COPY python_requirements /tmp/requirements.txt
+
+# Workaroud we use when running behind proxy
+# Basically we put the proxy certificate in certs folder
+# 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
+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 \
+    && 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
+
+RUN curl -sSL "https://bootstrap.pypa.io/pip/3.6/get-pip.py" -o "get-pip.py" \
+    && python3 get-pip.py
+
+# Upgrade pip
+RUN pip3 install --upgrade pip \
+    && pip3 -V \
+    && pip3 install virtualenv pycodestyle \
+    && pip3.8 install virtualenv pycodestyle \
+    && pip3.9 install virtualenv pycodestyle \
+    && pip3.11 install virtualenv pycodestyle \
+    && alternatives --set python /usr/bin/python3.11 \
+    && alternatives --set python3 /usr/bin/python3.11
+
+# Configure pip SSL validation
+RUN pip config set global.cert /etc/ssl/certs/ca-bundle.crt \
+    && pip config list
+
+# Install python requirements
+RUN python3.8 -m pip install -r /tmp/requirements.txt \
+    && python3.9 -m pip install -r /tmp/requirements.txt \
+    && python3.11 -m pip install -r /tmp/requirements.txt 
+
+# Install awscli2
+RUN curl -sSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+    && unzip -qq awscliv2.zip \
+    && ./aws/install \
+    && rm -f awscliv2.zip \
+    && rm -Rf ./aws
+
+# Install awssamcli
+RUN curl -sSL "https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip" -o "awssam.zip" \
+    && unzip -qq -d awssam awssam.zip \
+    && ./awssam/install && rm -f awssam.zip && rm -Rf ./awssam
+
+# Install aws cdk
+RUN wget -q "https://nodejs.org/dist/v${NODEJS_VERSION}/node-v${NODEJS_VERSION}-linux-x64.tar.xz" \
+    && xzcat node-v${NODEJS_VERSION}-linux-x64.tar.xz | tar xpf - -C /opt/ \
+    && mv /opt/node-v${NODEJS_VERSION}-linux-x64 /opt/node \
+    && rm -f node-v${NODEJS_VERSION}-linux-x64.tar.xz \
+    && /opt/node/bin/npm install -g aws-cdk \
+    && chown -R 1001:0 /opt/node && chmod +x /opt/node/bin/* \
+    && node --version \
+    && cdk --version
+
+# Install terraform
+RUN wget -q -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" \
+    && unzip /tmp/terraform.zip -d /usr/local/bin \
+    && rm -rf /tmp/terraform.zip \
+    && terraform -h
+
+# Install tfenv
+RUN umask 0002 && cd /opt && git clone --branch v${TFENV_VERSION} https://github.com/tfutils/tfenv.git \
+    && TFENV_CURL_OUTPUT=0 /opt/tfenv/bin/tfenv install ${TERRAFORM_VERSION} \
+    && /opt/tfenv/bin/tfenv use ${TERRAFORM_VERSION} \
+    && chown -R 1001:0 /opt/tfenv \
+    && chmod +x /opt/tfenv/bin/* \
+    && terraform -version \
+    && tfenv list
+
+# Install tflint
+RUN wget -q -O /tmp/tflint.zip "https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/tflint_linux_amd64.zip" \
+    && unzip /tmp/tflint.zip -d /usr/local/bin \
+    && rm -rf /tmp/tflint.zip \
+    && tflint --version
+
+# Install packer
+RUN wget -q -O /tmp/packer.zip "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip" \
+    && unzip /tmp/packer.zip -d /usr/local/bin \
+    && rm -rf /tmp/packer.zip \
+    && packer --version
+
+# Install terraform-config-inspect
+RUN wget -q -O /tmp/terraform-config-inspect.tar.gz https://github.com/nichtraunzer/terraform-config-inspect/releases/download/v${TERRAFORM_CONFIG_INSPECT_VERSION}/terraform-config-inspect_${TERRAFORM_CONFIG_INSPECT_VERSION}_linux_amd64.tar.gz \
+    && tar zxpf /tmp/terraform-config-inspect.tar.gz -C /usr/local/bin/ \
+    && rm -f /tmp/terraform-config-inspect.tar.gz \
+    && chmod 755 /usr/local/bin/terraform-config-inspect
+
+# Install terraform-docs
+RUN wget -q -O /tmp/terraform-docs.tar.gz https://github.com/terraform-docs/terraform-docs/releases/download/${TERRAFORM_DOCS_VERSION}/terraform-docs-${TERRAFORM_DOCS_VERSION}-linux-amd64.tar.gz \
+    && tar zxpf /tmp/terraform-docs.tar.gz -C /usr/local/bin/ terraform-docs \
+    && chmod +x /usr/local/bin/terraform-docs
+
+# Install jq
+RUN dnf install -y jq parallel \
+    && jq -Version \
+    && dnf clean all
+
+# Install consul-cli
+RUN wget -q "https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip" \
+    && unzip consul_${CONSUL_VERSION}_linux_amd64.zip -d /usr/local/bin \
+    && rm -f consul_${CONSUL_VERSION}_linux_amd64.zip \
+    && 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 \
+    && tar xzf /tmp/age.tar.gz -C /usr/local/bin \
+    && rm -f /tmp/age.tar.gz
+
+RUN chmod +t /tmp \
+    && chown -R 1001:0 $HOME \
+    && chmod -R g+rw $HOME \
+    && mkdir -p $GEM_HOME \
+    && chmod 2770 $GEM_HOME
+
+COPY Gemfile Gemfile.lock $GEM_HOME/
+
+RUN chown -R 1001:0 $GEM_HOME \
+    && chmod -R g+rw $GEM_HOME \
+    && ls -lisa /home/jenkins $GEM_HOME
+
+# Setup ruby env and bundler gems
+# RUBY https://syslint.com/blog/tutorial/how-to-install-ruby-on-rails-with-rbenv-on-centos-7-or-rhel-7/
+RUN cd /opt \
+    && umask 0002 \
+    && git clone https://github.com/rbenv/rbenv.git /opt/rbenv \
+    && echo 'export PATH="/opt/rbenv/shims:/opt/rbenv/bin:$PATH"' >> ~/.bash_profile \
+    && echo 'eval "$(rbenv init -)"' >> ~/.bash_profile \
+    && source ~/.bash_profile \
+    && git clone https://github.com/rbenv/ruby-build.git /opt/rbenv/plugins/ruby-build \
+    && echo 'export PATH="/opt/rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bash_profile \
+    && source ~/.bash_profile \
+    && rbenv install $RUBY_VERSION \
+    && rbenv global $RUBY_VERSION \
+    && gem install bundler -v $BUNDLER_VERSION \
+    && RBENV_VERSION=$RUBY_VERSION gem install bundler -v $BUNDLER_VERSION \
+    && bundle config default $BUNDLER_VERSION \
+    && RBENV_VERSION=$RUBY_VERSION bundle config default $BUNDLER_VERSION \
+    && bundle config set --global path $GEM_HOME \
+    && RBENV_VERSION=$RUBY_VERSION bundle config set --global path $GEM_HOME \
+    && cd $GEM_HOME \
+    && BUNDLE_SILENCE_ROOT_WARNING=true bundle install --full-index --jobs=8 \
+    && rm -Rf /home/jenkins/.bundle/cache
+
+USER 1001
+
diff --git a/common/jenkins-agents/terraform-2306/docker/Gemfile b/common/jenkins-agents/terraform-2306/docker/Gemfile
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+source 'https://rubygems.org' do
+  gem 'activesupport'
+  gem 'irb'
+  gem 'kitchen-terraform', '~> 7.0'
+  gem 'test-kitchen'
+  gem 'rspec-retry'
+  gem 'aws-sdk', '~> 3'
+end
+
+source 'https://packagecloud.io/cinc-project/stable' do
+  gem 'inspec-core'
+  gem 'inspec', '~> 5.21'
+  gem 'cinc-auditor-bin'
+  gem 'unf_ext'
+  gem 'chef-config'
+  gem 'chef-utils'
+  gem 'mixlib-install'
+  gem 'mixlib-versioning'
+end