Merge branch 'master' into docker-plain-helm-chart

Author: BraisVQ

.github/workflows/changelog-enforcer.yml

@@ -8,7 +8,7 @@ jobs:
   changelog:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
       - uses: dangoslen/changelog-enforcer@v3
         with:
           changeLogPath: 'CHANGELOG.md'

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

@@ -8,7 +8,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/golang/docker
@@ -24,7 +24,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/jdk/docker
@@ -35,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/[email protected]
-      -
-        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.7
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/nodejs18/docker
@@ -73,7 +57,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/nodejs20/docker
@@ -89,7 +73,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/nodejs22/docker
@@ -105,7 +89,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/python/docker
@@ -118,52 +102,53 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        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.80.1 \
+            --build-arg rustVersion=1.83.0 \
             --build-arg rustToolchain=x86_64-unknown-linux-gnu \
-            --build-arg cargoNextestVersion=0.9.72 \
-            --build-arg cargoLlvmCovVersion=0.6.11 \
-            --build-arg cargoGenerateVersion=0.21.3 \
+            --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)
+  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.7
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
-        working-directory: common/jenkins-agents/terraform/docker
+        working-directory: common/jenkins-agents/terraform-2306/docker
         run: |
-          docker build --tag agent-terraform-test-ubi8 --file Dockerfile.ubi8 .
+          docker build --tag agent-terraform-2306-test-ubi8 --file Dockerfile.ubi8 .
 
-  jenkins-agent-terraform-2306-ubi8:
-    name: Jenkins agent Terraform 2306 (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.7
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
-        working-directory: common/jenkins-agents/terraform-2306/docker
+        working-directory: common/jenkins-agents/terraform-2408/docker
         run: |
-          docker build --tag agent-terraform-2306-test-ubi8 --file Dockerfile.ubi8 .
+          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
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       -
         name: Build docker image
         working-directory: common/jenkins-agents/scala/docker

CHANGELOG.md

@@ -2,27 +2,59 @@
 
 ## Unreleased
 
+### Added
+
+### Changed
+- Add Helm Chart to Docker Plain Quickstarter ([#1035](https://github.com/opendevstack/ods-quickstarters/pull/1035))
+
+### 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))
-- Add Helm Chart to Docker Plain Quickstarter ([#1035](https://github.com/opendevstack/ods-quickstarters/pull/1035))
+- 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))
+- 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))
 
-### Added
+## [4.6.0] - 2024-10-23
 
 ### Changed
+- 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))
 
 ### Fixed
+- Replaced centos8 repository for RockyLinux 8 due to deprecation in terraform agents ([#1036](https://github.com/opendevstack/ods-quickstarters/pull/1036))
+- Remove obsolete branch parameter from release-manager ([#1058](https://github.com/opendevstack/ods-quickstarters/pull/1058))
 
 ## [4.5.0] - 2024-06-06
 

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-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-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 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-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 apply-jenkins-agent-nodejs22-build start-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs18-build start-jenkins-agent-nodejs20-build start-jenkins-agent-nodejs22-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)
@@ -77,11 +72,6 @@ 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-nodejs16".
-start-jenkins-agent-nodejs16-build:
-	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-nodejs16 --follow
-.PHONY: start-jenkins-agent-nodejs16-build
-
 ## Start build of BuildConfig "jenkins-agent-nodejs18".
 start-jenkins-agent-nodejs18-build:
 	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-nodejs18 --follow
@@ -145,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
@@ -177,6 +151,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:

be-rust-axum/Jenkinsfile

@@ -21,11 +21,11 @@ odsQuickstarterPipeline(
   // https://cargo-generate.github.io/cargo-generate/index.html
   stage('Cargo Generate project') {
     sh(
-      script: "cargo generate --path ${context.sourceDir}/rust-template --name ${context.projectId}-${context.componentId}",
-      label: "Process Rust template"
+      script: "cargo generate --path ${context.sourceDir}/rust-template --name ${context.componentId} --destination ${context.sourceDir}/tempdir",
+      label: "Process Rust template to tempdir"
     )
-    sh(
-      script: "mv ${context.projectId}-${context.componentId} ${context.sourceDir}/files",
+      sh(
+      script: "mv ${context.sourceDir}/tempdir/${context.componentId} ${context.sourceDir}/files",
       label: "Create files folder"
     )
   }