Prepare release 4.7.0, merge master into 4.x (#1094)

opendevstack · Jan 27, 2025 · 09e4ad5 · 09e4ad5
1 parent e5e5dd6
commit 09e4ad5
Show file tree

Hide file tree

Showing 183 changed files with 2,937 additions and 3,423 deletions.
diff --git a/.github/workflows/changelog-enforcer.yml b/.github/workflows/changelog-enforcer.yml
@@ -8,7 +8,7 @@ jobs:
   changelog:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.2.2
       - uses: dangoslen/changelog-enforcer@v3
         with:
           changeLogPath: 'CHANGELOG.md'

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
@@ -8,13 +8,14 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/golang/docker
         run: |
           docker build --tag agent-go-test-ubi8 --file Dockerfile.ubi8 \
-            --build-arg goDistributionUrl=https://go.dev/dl/go1.20.4.linux-amd64.tar.gz \
+            --build-arg goDistributionUrl=https://go.dev/dl/go1.23.0.linux-amd64.tar.gz \
+            --build-arg golangciVersion=v1.60.1 \
             .
 
   jenkins-agent-jdk-ubi8:
@@ -23,7 +24,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/jdk/docker
@@ -34,29 +35,13 @@ jobs:
               --build-arg nexusPassword=s3cr3t \
               .
 
-  jenkins-agent-nodejs16-ubi8:
-    name: Jenkins agent NodeJS 16 (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/nodejs16/docker
-        run: |
-            docker build --tag agent-nodejs16-test-ubi8 --file Dockerfile.ubi8 \
-              --build-arg nexusUrl=https://nexus.example.com \
-              --build-arg nexusAuth=developer:s3cr3t \
-              .
-
   jenkins-agent-nodejs18-ubi8:
     name: Jenkins agent NodeJS 18 (UBI8)
     runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/nodejs18/docker
@@ -72,7 +57,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/nodejs20/docker
@@ -88,7 +73,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/nodejs22/docker
@@ -104,7 +89,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/python/docker
@@ -117,36 +102,27 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/rust/docker
         run: |
           docker build --tag agent-rust-test-ubi8 --file Dockerfile.ubi8 \
-            --build-arg rustVersion=1.75.0 \
+            --build-arg rustVersion=1.83.0 \
             --build-arg rustToolchain=x86_64-unknown-linux-gnu \
+            --build-arg cargoNextestVersion=0.9.87 \
+            --build-arg cargoLlvmCovVersion=0.6.15 \
+            --build-arg cargoGenerateVersion=0.22.1 \
+            --build-arg cargoDenyVersion=0.16.3 \
             .
 
-  jenkins-agent-terraform-ubi8:
-    name: Jenkins agent Terraform (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/docker
-        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@v4.1.6
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/terraform-2306/docker
@@ -159,7 +135,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/terraform-2408/docker
@@ -172,7 +148,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/scala/docker

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,33 +2,48 @@
 
 ## Unreleased
 
+### Added
+
+### Changed
+
+### Fixed
+
+## [4.7.0] - 2025-1-27
+
+### Added
+- Introduce Rust Quickstarter dependency graph linting (cargo-deny) and upgrade maintenance ([#1061](https://github.com/opendevstack/ods-quickstarters/issues/1061))
+- Enable OpenSSL vendored compilation for Rust Jenkins Agent ([#1026](https://github.com/opendevstack/ods-quickstarters/pull/1026))
+- Added custom reporter to Cypress Quickstarter and update dependencies ([#1034](https://github.com/opendevstack/ods-quickstarters/pull/1034))
+- Add microsoft-edge to nodejs agents for using with cypress ([#1063](https://github.com/opendevstack/ods-quickstarters/pull/1063))
+- Added new function to cypress to log into applications using MFA ([#1070](https://github.com/opendevstack/ods-quickstarters/pull/1070))
 
+### Changed
+- Removal of deprecated versions ([#1068](https://github.com/opendevstack/ods-quickstarters/issues/1068))
 - Update OS packages by default and bump gitleaks version ([#1049](https://github.com/opendevstack/ods-quickstarters/issues/1049))
 - Install java 17 devel only in scala and jdk agents ([#1057](https://github.com/opendevstack/ods-quickstarters/pull/1057))
 - Update Angular, Ionic and Typescript Quickstarters ([#1033](https://github.com/opendevstack/ods-quickstarters/issues/1033))
 - Update Rust Axum Quickstarter to Rust 1.79.0 ([#1024](https://github.com/opendevstack/ods-quickstarters/pull/1024))
-- Update jdk and scala quickstarters and agents ([#1032](https://github.com/opendevstack/ods-quickstarters/issues/1032))
-- Gitleaks docs fix and update ([#1028](https://github.com/opendevstack/ods-quickstarters/issues/1028))
-- Enable OpenSSL vendored compilation for Rust Jenkins Agent ([#1026](https://github.com/opendevstack/ods-quickstarters/pull/1026))
+- Update Rust Axum Quickstarter to Rust 1.80.1 and improve Agent build configuration ([#1040](https://github.com/opendevstack/ods-quickstarters/pull/1040))
+- Rust Jenkins agent and Quickstarter updates of January 2025 ([#1087](https://github.com/opendevstack/ods-quickstarters/issues/1087))
+- Mobile testing enablement adding Appium & Sauce Labs in e2e-spock-geb quickstarter ([#1083](https://github.com/opendevstack/ods-quickstarters/pull/1083))
+- Generate PDF report for cypress and improved environment management ([#1079](https://github.com/opendevstack/ods-quickstarters/pull/1079))
+- Change PDF report zip file name in Cypress Quickstarter ([#1082](https://github.com/opendevstack/ods-quickstarters/pull/1082))
+- Improvements in the reporter for cypress ([#1042](https://github.com/opendevstack/ods-quickstarters/issues/1042))
+- Support for Python3.12, and maintenance of be-python-flask quickstarter and python Jenkins agent ([#1030](https://github.com/opendevstack/ods-quickstarters/pull/1030))
 - Update Streamlit Quickstarter ([#1030](https://github.com/opendevstack/ods-quickstarters/issues/1030))
 - Update Golang agent ([#1031](https://github.com/opendevstack/ods-quickstarters/issues/1031))
 - Update gateway/nginx Quickstarter ([#1048](https://github.com/opendevstack/ods-quickstarters/pull/1048))
-- Update Rust Axum Quickstarter to Rust 1.80.1 and improve Agent build configuration ([#1040](https://github.com/opendevstack/ods-quickstarters/pull/1040))
-- Support for Python3.12, and maintenance of be-python-flask quickstarter and python Jenkins agent ([#1030](https://github.com/opendevstack/ods-quickstarters/pull/1030))
-- Added custom reporter to Cypress Quickstarter and update dependencies ([#1034](https://github.com/opendevstack/ods-quickstarters/pull/1034))
-- Fix permissions in Golang agent for the golden tests ([#1052](https://github.com/opendevstack/ods-quickstarters/pull/1052))
-- Fix ETL Python QS: AWS Test codepipeline Status Managment and update cryptography dependency([#1056](https://github.com/opendevstack/ods-quickstarters/pull/1052))
-- Fix for npm based jenkins agents to support private nexus repositories ([#1059](https://github.com/opendevstack/ods-quickstarters/issues/1059))
-- Introduce Rust Quickstarter dependency graph linting (cargo-deny) and upgrade maintenance ([#1061](https://github.com/opendevstack/ods-quickstarters/issues/1061))
-- 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))
-
-### Added
-
-### Changed
+- Gitleaks docs fix and update ([#1028](https://github.com/opendevstack/ods-quickstarters/issues/1028))
+- Update jdk and scala quickstarters and agents ([#1032](https://github.com/opendevstack/ods-quickstarters/issues/1032))
 
 ### Fixed
+- Replaced centos8 repository for AlmaLinux 8 due to deprecation ([#1063](https://github.com/opendevstack/ods-quickstarters/pull/1063))
+- Nodejs agents should make use of the installed certificates in the agent ([#1078](https://github.com/opendevstack/ods-quickstarters/issues/1078))
+- Fix for npm based jenkins agents to support private nexus repositories ([#1059](https://github.com/opendevstack/ods-quickstarters/issues/1059))
+- Fix Ruby installation with high amount of CPU cores ([#1084](https://github.com/opendevstack/ods-quickstarters/issues/1084))
+- Included small fixes in e2e-cypress ([#1086](https://github.com/opendevstack/ods-quickstarters/pull/1086))
+- Fix ETL Python QS: AWS Test codepipeline Status Managment and update cryptography dependency([#1056](https://github.com/opendevstack/ods-quickstarters/pull/1052))
+- Fix permissions in Golang agent for the golden tests ([#1052](https://github.com/opendevstack/ods-quickstarters/pull/1052))
 
 ## [4.6.0] - 2024-10-23
 

diff --git a/Makefile b/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-terraform-2408 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-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-terraform-build-2408 apply-jenkins-agent-rust-build
+apply-jenkins-agent-build: apply-jenkins-agent-golang-build apply-jenkins-agent-jdk-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-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 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
+start-jenkins-agent-build: start-jenkins-agent-golang-build start-jenkins-agent-jdk-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-2306 start-jenkins-agent-terraform-build-2408 start-jenkins-agent-rust-build
 .PHONY: start-jenkins-agent-build
 
 
@@ -54,14 +54,9 @@ start-jenkins-agent-jdk-build:
 
 # JENKINS AGENT NODEJS
 ## Install or update Jenkins Node agent resources.
-install-jenkins-agent-nodejs: apply-jenkins-agent-nodejs16-build apply-jenkins-agent-nodejs18-build apply-jenkins-agent-nodejs20-build start-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs18-build start-jenkins-agent-nodejs20-build
+install-jenkins-agent-nodejs: apply-jenkins-agent-nodejs18-build apply-jenkins-agent-nodejs20-build apply-jenkins-agent-nodejs22-build start-jenkins-agent-nodejs18-build start-jenkins-agent-nodejs20-build start-jenkins-agent-nodejs22-build
 .PHONY: install-jenkins-agent-nodejs
 
-## Update OpenShift resources related to Jenkins Node 16 agent image.
-apply-jenkins-agent-nodejs16-build:
-	cd common/jenkins-agents/nodejs16/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
-.PHONY: apply-jenkins-agent-nodejs16-build
-
 ## Update OpenShift resources related to Jenkins Node 18 agent image.
 apply-jenkins-agent-nodejs18-build:
 	cd common/jenkins-agents/nodejs18/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
@@ -72,10 +67,10 @@ apply-jenkins-agent-nodejs20-build:
 	cd common/jenkins-agents/nodejs20/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
 .PHONY: apply-jenkins-agent-nodejs20-build
 
-## Start build of BuildConfig "jenkins-agent-nodejs16".
-start-jenkins-agent-nodejs16-build:
-	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-nodejs16 --follow
-.PHONY: start-jenkins-agent-nodejs16-build
+## Update OpenShift resources related to Jenkins Node 22 agent image.
+apply-jenkins-agent-nodejs22-build:
+	cd common/jenkins-agents/nodejs22/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
+.PHONY: apply-jenkins-agent-nodejs22-build
 
 ## Start build of BuildConfig "jenkins-agent-nodejs18".
 start-jenkins-agent-nodejs18-build:
@@ -87,6 +82,11 @@ start-jenkins-agent-nodejs20-build:
 	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-nodejs20 --follow
 .PHONY: start-jenkins-agent-nodejs20-build
 
+## Start build of BuildConfig "jenkins-agent-nodejs22".
+start-jenkins-agent-nodejs22-build:
+	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-nodejs22 --follow
+.PHONY: start-jenkins-agent-nodejs22-build
+
 # JENKINS AGENT PYTHON
 ## Install or update Jenkins Python agent resources.
 install-jenkins-agent-python: apply-jenkins-agent-python-build start-jenkins-agent-python-build
@@ -135,22 +135,6 @@ start-jenkins-agent-scala-build:
 .PHONY: start-jenkins-agent-scala-build
 
 
-# JENKINS AGENT TERRAFORM
-## Install or update Jenkins Terraform agent resources.
-install-jenkins-agent-terraform: apply-jenkins-agent-terraform-build start-jenkins-agent-terraform-build
-.PHONY: install-jenkins-agent-terraform
-
-## Update OpenShift resources related to Jenkins Terraform agent image.
-apply-jenkins-agent-terraform-build:
-	cd common/jenkins-agents/terraform/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
-.PHONY: apply-jenkins-agent-terraform-build
-
-## Start build of BuildConfig "jenkins-agent-terraform".
-start-jenkins-agent-terraform-build:
-	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-terraform --follow
-.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

diff --git a/be-fe-mono-repo-plain/files/.pre-commit-config.yaml b/be-fe-mono-repo-plain/files/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
 repos:
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.16.1
+    rev: v8.18.4
     hooks:
       - id: gitleaks
diff --git a/be-fe-mono-repo-plain/files/docker_be/Dockerfile b/be-fe-mono-repo-plain/files/docker_be/Dockerfile
@@ -3,6 +3,10 @@ FROM alpine:latest
 
 RUN echo "building simple backend container"
 
+RUN apk update  && \
+    apk -i upgrade && \
+    apk cache clean
+
 EXPOSE 8081
 
 CMD ["/bin/sh", "-c", "/usr/bin/nc -lk -p 8081 -e echo -e \"HTTP/1.1 200 OK\n\nHello World!\n$(date)\""]
diff --git a/be-fe-mono-repo-plain/files/docker_fe/Dockerfile b/be-fe-mono-repo-plain/files/docker_fe/Dockerfile
@@ -3,6 +3,10 @@ FROM alpine:latest
 
 RUN echo "building simple frontend container"
 
+RUN apk update  && \
+    apk -i upgrade && \
+    apk cache clean
+
 EXPOSE 8080
 
 CMD ["/bin/sh", "-c", "/usr/bin/nc -lk -p 8080 -e echo -e \"HTTP/1.1 200 OK\n\nHello World!\n$(date)\""]
diff --git a/be-gateway-nginx/files/.pre-commit-config.yaml b/be-gateway-nginx/files/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
 repos:
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.16.1
+    rev: v8.18.4
     hooks:
       - id: gitleaks
diff --git a/be-gateway-nginx/files/docker/Dockerfile b/be-gateway-nginx/files/docker/Dockerfile
@@ -1,5 +1,5 @@
 # https://github.com/openresty/docker-openresty
-FROM openresty/openresty:1.25.3.1-1-rocky
+FROM openresty/openresty:1.25.3.2-0-rocky
 
 ENV LANG=C.UTF-8
 
@@ -15,6 +15,9 @@ COPY lua /usr/local/openresty/lualib
 COPY nginx.conf /usr/local/openresty/nginx/conf/
 COPY entrypoint.sh /app/
 
+RUN dnf upgrade -y && \
+    dnf clean all
+
 RUN chgrp -R 0 /app /usr/local/openresty/nginx && \
     chmod -R g=u /app /usr/local/openresty/nginx && \
     chmod +x /app/entrypoint.sh && \

diff --git a/be-gateway-nginx/files/metadata.yml b/be-gateway-nginx/files/metadata.yml
@@ -1,6 +1,6 @@
 ---
 name: nginx
-description: "Enhanced nginx with Lua embeded. nginx [engine x] is an HTTP and reverse proxy server, a mail proxy server, and a generic TCP/UDP proxy server. Technologies: OpenResty/nginx 1.25.3.1-1"
+description: "Enhanced nginx with Lua embeded. nginx [engine x] is an HTTP and reverse proxy server, a mail proxy server, and a generic TCP/UDP proxy server. Technologies: OpenResty/nginx 1.25.3.2-0"
 supplier: https://openresty.org
 version: 4.x
 type: ods-service
diff --git a/be-golang-plain/files/.pre-commit-config.yaml b/be-golang-plain/files/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
 repos:
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.16.1
+    rev: v8.18.4
     hooks:
       - id: gitleaks
diff --git a/be-golang-plain/files/docker/Dockerfile b/be-golang-plain/files/docker/Dockerfile
@@ -24,6 +24,10 @@ FROM alpine
 
 COPY app_linux_amd64 app_linux_amd64
 
+RUN apk update  && \
+    apk -i upgrade && \
+    apk cache clean
+
 EXPOSE 8080
 
 CMD ["./app_linux_amd64"]