Release branch update for v4.3.0 (#944)

.github/dependabot.yml

@@ -0,0 +1,10 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.github/workflows/changelog-enforcer.yml

@@ -8,8 +8,8 @@ jobs:
   changelog:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: dangoslen/changelog-enforcer@v2
+      - uses: actions/checkout@v3.5.3
+      - uses: dangoslen/changelog-enforcer@v3
         with:
           changeLogPath: 'CHANGELOG.md'
           skipLabels: 'skip changelog'

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

@@ -8,27 +8,27 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v3.5.3
       -
         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://golang.org/dl/go1.14.2.linux-amd64.tar.gz \
+            --build-arg goDistributionUrl=https://go.dev/dl/go1.20.4.linux-amd64.tar.gz \
             .
 
-  jenkins-agent-maven-ubi8:
-    name: Jenkins agent Maven (UBI8)
+  jenkins-agent-jdk-ubi8:
+    name: Jenkins agent JDK (UBI8)
     runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v3.5.3
       -
         name: Build docker image
-        working-directory: common/jenkins-agents/maven/docker
+        working-directory: common/jenkins-agents/jdk/docker
         run: |
-            docker build --tag agent-maven-test-ubi8 --file Dockerfile.ubi8 \
+            docker build --tag agent-jdk-test-ubi8 --file Dockerfile.ubi8 \
               --build-arg nexusUrl=https://nexus.example.com \
               --build-arg nexusUsername=developer \
               --build-arg nexusPassword=s3cr3t \
@@ -40,7 +40,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v3.5.3
       -
         name: Build docker image
         working-directory: common/jenkins-agents/nodejs12/docker
@@ -56,7 +56,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v3.5.3
       -
         name: Build docker image
         working-directory: common/jenkins-agents/nodejs16/docker
@@ -66,13 +66,29 @@ jobs:
               --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@v3.5.3
+      -
+        name: Build docker image
+        working-directory: common/jenkins-agents/nodejs18/docker
+        run: |
+            docker build --tag agent-nodejs18-test-ubi8 --file Dockerfile.ubi8 \
+              --build-arg nexusUrl=https://nexus.example.com \
+              --build-arg nexusAuth=developer:s3cr3t \
+              .
+
   jenkins-agent-python-ubi8:
     name: Jenkins agent Python (UBI8)
     runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v3.5.3
       -
         name: Build docker image
         working-directory: common/jenkins-agents/python/docker
@@ -85,20 +101,33 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v3.5.3
       -
         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@v3.5.3
+      -
+        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
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v3.5.3
       -
         name: Build docker image
         working-directory: common/jenkins-agents/scala/docker

CHANGELOG.md

@@ -1,6 +1,59 @@
 # Changelog
 
-## Unreleased
+### Added
+
+### Modified
+
+### Fixed
+
+## [4.3.0] - 2023-07-13
+
+### Added
+- Addition of streamlit quickstarter ([#891](https://github.com/opendevstack/ods-quickstarters/issues/891))
+- Cypress Cloud integration and switch to nodejs 18 ([#935](https://github.com/opendevstack/ods-quickstarters/pull/935))
+- Provide build agent for Node.js 18 ([#794](https://github.com/opendevstack/ods-quickstarters/issues/794))
+
+### Modified
+- Generate one xml report per spec and merge them later ([#898](https://github.com/opendevstack/ods-quickstarters/pull/898))
+- Removal of Centos agents ([#1209](https://github.com/opendevstack/ods-core/issues/1209))
+- Update of Python agent, Python, Streamlit and Jupyter quickstarters ([#902](https://github.com/opendevstack/ods-quickstarters/issues/902))
+- inf-terraform-aws: remove cloudformation stack from default quickstarter ([#934](https://github.com/opendevstack/ods-quickstarters/pull/934))
+- inf-terraform-aws: switch from shared statefile location to dedicated ([#932](https://github.com/opendevstack/ods-quickstarters/pull/932))
+- Change sonar-scan.json and release manager template to use any project ([#933](https://github.com/opendevstack/ods-quickstarters/pull/933))
+- Add binutils package to jdk-17 agent ([#929](https://github.com/opendevstack/ods-core/issues/929))
+- inf-terraform-[aws|azure], bump inspec-aws (v1.83.60) & inspec-azure (v1.118.41) library versions, drop use of symbolized keys in helper yaml files ([#927](https://github.com/opendevstack/ods-quickstarters/pull/927))
+- inf-terraform-[aws|azure], jenkins-agent-terraform-2306 with tooling update (ruby 3.2.2, python 3.11) ([#923](https://github.com/opendevstack/ods-quickstarters/pull/923))
+- Update python agent, pyhon, streamlit and jupyter quickstarters to 3.11 ([#924](https://github.com/opendevstack/ods-quickstarters/pull/924))
+- Upgrade to Cypress 12 ([#908](https://github.com/opendevstack/ods-quickstarters/pull/908))
+- Update scala agent and be-scala-play quickstarter ([#919](https://github.com/opendevstack/ods-quickstarters/pull/919))
+- Update Ionic Quickstarter ([#917](https://github.com/opendevstack/ods-quickstarters/pull/917))
+- Update Go quickstarter to Go 1.20 and align version of golangci-lint and go-junit-report ([#915](https://github.com/opendevstack/ods-quickstarters/pull/915))
+- Rename maven-agent to jdk-agent, update springboot & spock-geb quickstarters ([#901](https://github.com/opendevstack/ods-quickstarters/pull/901))
+- Update Angular and TypeScript quickstarters ([#910](https://github.com/opendevstack/ods-quickstarters/pull/910))
+- Upgrade be-gateway-nginx to rocky 1.21 openresty/nginx ([#883](https://github.com/opendevstack/ods-quickstarters/pull/883))
+- Set default rollout strategy to recreate ([#926](https://github.com/opendevstack/ods-quickstarters/issues/926))
+
+### Fixed
+- Fix oauth-proxy sidecar image ([#862](https://github.com/opendevstack/ods-quickstarters/issues/862))
+- Fix Jenkinsfile params in StreamLit ([#941](https://github.com/opendevstack/ods-quickstarters/pull/941)) ([#939](https://github.com/opendevstack/ods-quickstarters/pull/939))
+- Fixed Angular build for error "Unknown argument: sourceMap" ([#940](https://github.com/opendevstack/ods-quickstarters/pull/940))
+- Fix mismatch on java version in base and jdk agents ([#916](https://github.com/opendevstack/ods-quickstarters/pull/916))
+- TypeScript QS fails to build ([#897](https://github.com/opendevstack/ods-quickstarters/issues/897))
+- Issues with agent permision in new OCP version ([#901](https://github.com/opendevstack/ods-quickstarters/pull/901))
+- Removed protractor-related configuration from `ini.sh` in Ionic quickstarter ([#885](https://github.com/opendevstack/ods-quickstarters/issues/885))
+- change /tmp permissions in inf-terraform-agent ([#903](https://github.com/opendevstack/ods-quickstarters/pull/903))
+- nodejs 18 agent builds fail ([#905](https://github.com/opendevstack/ods-quickstarters/issues/905))
+- Fix imagePullPolicy issue when verifying the image ([#874](https://github.com/opendevstack/ods-quickstarters/issues/874))
+- Fix Release manager Jenkinsfile ([#943](https://github.com/opendevstack/ods-quickstarters/pull/943))
+
+## [4.1] - 2022-11-17
+
+### Added
+
+- ODS AMI build fails due to failing jacoco report generation in springboot quickstarter ([#700](https://github.com/opendevstack/ods-quickstarters/pull/700))
+- Add Node.js 16 builder agent ([#763](https://github.com/opendevstack/ods-quickstarters/issues/763))
+- Add Azure Quickstarter ([#788](https://github.com/opendevstack/ods-quickstarters/issues/788))
+- Add Node.js 18 builder agent ([#763](https://github.com/opendevstack/ods-quickstarters/issues/794))
 
 - Addition of streamlit quickstarter ([#891](https://github.com/opendevstack/ods-quickstarters/issues/891))
 - Removal of Centos agents ([#1209](https://github.com/opendevstack/ods-core/issues/1209))

CODEOWNERS

@@ -8,8 +8,9 @@
 /docker-plain/ @michaelsauter
 /ds-jupyter-lab/ @gerardcl @hugowschneider
 /ds-rshiny/ @gerardcl
-/e2e-cypress/ @cschweikert
-/e2e-spock-geb/ @metmajer
+/ds-streamlit/ @sklingel
+/e2e-cypress/ @cschweikert @garcanam @roicarrera
+/e2e-spock-geb/ @metmajer @garcanam @roicarrera
 /fe-angular/ @cschweikert
 /fe-ionic/ @rianet @bljubisic
 /inf-terraform-aws/ @frankjoas @metmajer @nichtraunzer @tbugfinder

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-maven install-jenkins-agent-nodejs install-jenkins-agent-python install-jenkins-agent-scala install-jenkins-agent-terraform
+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
 .PHONY: install-jenkins-agent
 
 ## Update OpenShift resources related Jenkins agent resources.
-apply-jenkins-agent-build: apply-jenkins-agent-golang-build apply-jenkins-agent-maven-build apply-jenkins-agent-nodejs12-build apply-jenkins-agent-nodejs16-build apply-jenkins-agent-python-build apply-jenkins-agent-scala-build apply-jenkins-agent-terraform-build
+apply-jenkins-agent-build: apply-jenkins-agent-golang-build apply-jenkins-agent-jdk-build apply-jenkins-agent-nodejs12-build apply-jenkins-agent-nodejs16-build apply-jenkins-agent-nodejs18-build apply-jenkins-agent-python-build apply-jenkins-agent-scala-build apply-jenkins-agent-terraform-build
 .PHONY: apply-jenkins-agent-build
 
 ## Start builds of Jenkins agents.
-start-jenkins-agent-build: start-jenkins-agent-golang-build start-jenkins-agent-maven-build start-jenkins-agent-nodejs12-build start-jenkins-agent-nodejs16-build start-jenkins-agent-python-build start-jenkins-agent-scala-build start-jenkins-agent-terraform-build
+start-jenkins-agent-build: start-jenkins-agent-golang-build start-jenkins-agent-jdk-build start-jenkins-agent-nodejs12-build start-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs18-build start-jenkins-agent-python-build start-jenkins-agent-scala-build start-jenkins-agent-terraform-build
 .PHONY: start-jenkins-agent-build
 
 
@@ -36,25 +36,25 @@ start-jenkins-agent-golang-build:
 .PHONY: start-jenkins-agent-golang-build
 
 
-# JENKINS AGENT MAVEN
-## Install or update Jenkins Maven agent resources.
-install-jenkins-agent-maven: apply-jenkins-agent-maven-build start-jenkins-agent-maven-build
-.PHONY: install-jenkins-agent-maven
+# JENKINS AGENT JDK
+## Install or update Jenkins JDK agent resources.
+install-jenkins-agent-jdk: apply-jenkins-agent-jdk-build start-jenkins-agent-jdk-build
+.PHONY: install-jenkins-agent-jdk
 
-## Update OpenShift resources related to Jenkins Maven agent image.
-apply-jenkins-agent-maven-build:
-	cd common/jenkins-agents/maven/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
-.PHONY: apply-jenkins-agent-maven-build
+## Update OpenShift resources related to Jenkins JDK agent image.
+apply-jenkins-agent-jdk-build:
+	cd common/jenkins-agents/jdk/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
+.PHONY: apply-jenkins-agent-jdk-build
 
-## Start build of BuildConfig "jenkins-agent-maven".
-start-jenkins-agent-maven-build:
-	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-maven --follow
-.PHONY: start-jenkins-agent-maven-build
+## Start build of BuildConfig "jenkins-agent-jdk".
+start-jenkins-agent-jdk-build:
+	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-jdk --follow
+.PHONY: start-jenkins-agent-jdk-build
 
 
 # JENKINS AGENT NODEJS
 ## Install or update Jenkins Node agent resources.
-install-jenkins-agent-nodejs: apply-jenkins-agent-nodejs12-build apply-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs12-build start-jenkins-agent-nodejs16-build
+install-jenkins-agent-nodejs: apply-jenkins-agent-nodejs12-build apply-jenkins-agent-nodejs16-build apply-jenkins-agent-nodejs18-build start-jenkins-agent-nodejs12-build start-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs18-build
 .PHONY: install-jenkins-agent-nodejs
 
 ## Update OpenShift resources related to Jenkins Node agent image.
@@ -66,6 +66,10 @@ apply-jenkins-agent-nodejs16-build:
 	cd common/jenkins-agents/nodejs16/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
 .PHONY: apply-jenkins-agent-nodejs16-build
 
+apply-jenkins-agent-nodejs18-build:
+	cd common/jenkins-agents/nodejs18/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
+.PHONY: apply-jenkins-agent-nodejs18-build
+
 ## Start build of BuildConfig "jenkins-agent-nodejs*".
 start-jenkins-agent-nodejs12-build:
 	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-nodejs12 --follow
@@ -75,6 +79,10 @@ start-jenkins-agent-nodejs16-build:
 	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-nodejs16 --follow
 .PHONY: start-jenkins-agent-nodejs16-build
 
+start-jenkins-agent-nodejs18-build:
+	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-nodejs18 --follow
+.PHONY: start-jenkins-agent-nodejs18-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
@@ -123,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:

be-gateway-nginx/files/docker/Dockerfile

@@ -1,5 +1,5 @@
 # https://github.com/openresty/docker-openresty
-FROM openresty/openresty:1.19.3.2-fedora-rpm
+FROM openresty/openresty:1.21.4.1-rocky
 
 ENV LANG=C.UTF-8
 

be-golang-plain/testdata/golden/sonar-scan.json

@@ -1,13 +1,12 @@
 {
-  "key": "unitt-golang-iq-test",
-  "organization": "default-organization",
-  "name": "unitt-golang-iq-test",
+  "key": "{{.ProjectID}}-{{.ComponentID}}",
+  "name": "{{.ProjectID}}-{{.ComponentID}}",
   "isFavorite": false,
   "visibility": "public",
   "extensions": [],
   "qualityProfiles": [
     {
-      "name": "Sonar way",
+      "name": "{{.SonarQualityProfile}}",
       "language": "go",
       "deleted": false
     }
@@ -18,8 +17,8 @@
   },
   "breadcrumbs": [
     {
-      "key": "unitt-golang-iq-test",
-      "name": "unitt-golang-iq-test",
+      "key": "{{.ProjectID}}-{{.ComponentID}}",
+      "name": "{{.ProjectID}}-{{.ComponentID}}",
       "qualifier": "TRK"
     }
   ]

be-java-springboot/Jenkinsfile

@@ -15,21 +15,21 @@ node {
 library("ods-jenkins-shared-library@${sharedLibraryRef}")
 
 odsQuickstarterPipeline(
-  imageStreamTag: "${odsNamespace}/jenkins-agent-maven:${agentImageTag}",
+  imageStreamTag: "${odsNamespace}/jenkins-agent-jdk:${agentImageTag}",
 ) { context ->
 
   stage('Build spring project') {
     dir(context.targetDir) {
-      def springBootVersion = '2.7.1'
+      def springBootVersion = '3.0.5'
       echo "--- create spring boot (v${springBootVersion}) project via spring initializr ---"
 
       sh "curl https://start.spring.io/starter.tgz \
             -d type=gradle-project \
             -d language=java \
-            -d dependencies='web,data-rest,restdocs,data-jpa,h2,security,devtools' \
-            -d bootVersion=${springBootVersion} \
+            -d dependencies='web,data-rest,data-jpa,h2,security,devtools' \
+            -d platformVersion=${springBootVersion} \
             -d packaging=jar \
-            -d javaVersion=17 \
+            -d jvmVersion=17 \
             -d groupId=${context.projectId} \
             -d artifactId=${context.componentId} \
             -d name=${context.componentId} \

be-java-springboot/Jenkinsfile.template

@@ -3,7 +3,7 @@
 @Library('ods-jenkins-shared-library@@shared_library_ref@') _
 
 odsComponentPipeline(
-  imageStreamTag: '@ods_namespace@/jenkins-agent-maven:@agent_image_tag@',
+  imageStreamTag: '@ods_namespace@/jenkins-agent-jdk:@agent_image_tag@',
   branchToEnvironmentMapping: [
     'master': 'dev',
     // 'release/': 'test'

be-java-springboot/files/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17
+FROM registry.access.redhat.com/ubi9/openjdk-17
 
 # Enforce runtime protection for log4j2 CVE-2021-44228 (affected version from 2.0 to 2.14.1) in the affected vesion is used.
 # This applies for version from 2.10 and not below.