Merge branch 'master' into feature/update-rm-readme

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

@@ -34,22 +34,6 @@ jobs:
               --build-arg nexusPassword=s3cr3t \
               .
 
-  jenkins-agent-nodejs12-ubi8:
-    name: Jenkins agent NodeJS 12 (UBI8)
-    runs-on: ubuntu-22.04
-    steps:
-      -
-        name: Checkout repository
-        uses: actions/[email protected]
-      -
-        name: Build docker image
-        working-directory: common/jenkins-agents/nodejs12/docker
-        run: |
-            docker build --tag agent-nodejs12-test-ubi8 --file Dockerfile.ubi8 \
-              --build-arg nexusUrl=https://nexus.example.com \
-              --build-arg nexusAuth=developer:s3cr3t \
-              .
-
   jenkins-agent-nodejs16-ubi8:
     name: Jenkins agent NodeJS 16 (UBI8)
     runs-on: ubuntu-22.04

CHANGELOG.md

@@ -4,8 +4,10 @@
 - Added secret scanning in docker plain ([#963](https://github.com/opendevstack/ods-quickstarters/pull/963))
 - Added Nodejs20 agent ([#962](https://github.com/opendevstack/ods-quickstarters/issues/962))
 - Update release manager readme ([#969](https://github.com/opendevstack/ods-quickstarters/issues/969))
+- Update Streamlit and Python quickstarters and agent ([#968](https://github.com/opendevstack/ods-quickstarters/issues/968))
 
 ### Modified
+- Remove nodejs12 form the code ([#936](https://github.com/opendevstack/ods-quickstarters/issues/936))
 
 ### Fixed
 - Maintenance for Golang Agent and QuickStarter ([#955](https://github.com/opendevstack/ods-quickstarters/issues/955))

Makefile

@@ -12,11 +12,11 @@ install-jenkins-agent: install-jenkins-agent-golang install-jenkins-agent-jdk in
 .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-nodejs12-build apply-jenkins-agent-nodejs16-build apply-jenkins-agent-nodejs18-build apply-jenkins-agent-nodejs20-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-nodejs16-build apply-jenkins-agent-nodejs18-build apply-jenkins-agent-nodejs20-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-jdk-build start-jenkins-agent-nodejs12-build start-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs18-build start-jenkins-agent-nodejs20-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-nodejs16-build start-jenkins-agent-nodejs18-build start-jenkins-agent-nodejs20-build start-jenkins-agent-python-build start-jenkins-agent-scala-build start-jenkins-agent-terraform-build
 .PHONY: start-jenkins-agent-build
 
 
@@ -54,14 +54,10 @@ 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 apply-jenkins-agent-nodejs18-build apply-jenkins-agent-nodejs20-build start-jenkins-agent-nodejs12-build start-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs18-build start-jenkins-agent-nodejs20-build
+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
 .PHONY: install-jenkins-agent-nodejs
 
 ## Update OpenShift resources related to Jenkins Node agent image.
-apply-jenkins-agent-nodejs12-build:
-	cd common/jenkins-agents/nodejs12/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
-.PHONY: apply-jenkins-agent-nodejs12-build
-
 apply-jenkins-agent-nodejs16-build:
 	cd common/jenkins-agents/nodejs16/ocp-config && tailor apply --namespace $(ODS_NAMESPACE)
 .PHONY: apply-jenkins-agent-nodejs16-build
@@ -75,10 +71,6 @@ apply-jenkins-agent-nodejs20-build:
 .PHONY: apply-jenkins-agent-nodejs20-build
 
 ## Start build of BuildConfig "jenkins-agent-nodejs*".
-start-jenkins-agent-nodejs12-build:
-	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-nodejs12 --follow
-.PHONY: start-jenkins-agent-nodejs12-build
-
 start-jenkins-agent-nodejs16-build:
 	oc -n $(ODS_NAMESPACE) start-build jenkins-agent-nodejs16 --follow
 .PHONY: start-jenkins-agent-nodejs16-build

be-python-flask/files/metadata.yml

@@ -1,6 +1,6 @@
 ---
 name: Flask
-description: "Flask is a micro web framework written in Python. Technologies: Flask 2.2.2, Python 3.9"
+description: "Flask is a micro web framework written in Python. Technologies: Flask 3.0.0, Python 3.11"
 supplier: https://www.palletsprojects.com/p/flask/
 version: 4.x
 type: ods

be-python-flask/files/requirements.txt

@@ -1,2 +1,2 @@
-gunicorn==20.1.0
-flask==2.3.2
+gunicorn==21.2.0
+flask==3.0.0

be-python-flask/files/tests_requirements.txt

@@ -1,6 +1,6 @@
 -r ./requirements.txt
 
-mypy==1.3.0
-flake8==6.0.0
-pytest==7.3.1
+mypy==1.7.1
+flake8==6.1.0
+pytest==7.4.3
 pytest-cov==4.1.0

common/jenkins-agents/README.md

@@ -17,12 +17,12 @@ The ODS [jenkins shared library](https://github.com/opendevstack/ods-jenkins-sha
 
 1. [GoLang](golang)
 2. [Jdk](jdk)
-3. [Node.js 12](nodejs12)
-4. [Node.js 16](nodejs16)
+3. [Node.js 16](nodejs16)
 4. [Node.js 18](nodejs18)
-5. [Python](python)
-6. [Scala & SBT](scala)
-7. [Terraform](terraform)
+5. [Node.js 20](nodejs20)
+6. [Python](python)
+7. [Scala & SBT](scala)
+8. [Terraform](terraform)
 
 ## OCP Config / Installation
 

common/jenkins-agents/python/docker/Dockerfile.ubi8

@@ -26,7 +26,7 @@ RUN pipVersions=( pip3.8 pip3.9 pip3.11 ); \
         fi; \
         $pipV config set global.cert /etc/ssl/certs/ca-bundle.crt && \
         $pipV install --upgrade pip --user && \
-        $pipV install virtualenv==20.23.0 setuptools==67.8.0 Cython==0.29.35 pypandoc==1.11; \
+        $pipV install virtualenv==20.25.0 setuptools==69.0.2 Cython==3.0.6 pypandoc==1.12; \
     done;
 
 # Enables default user to access $HOME folder

docs/modules/jenkins-agents/pages/nodejs12.adoc → docs/modules/jenkins-agents/pages/nodejs20.adoc

@@ -1,12 +1,12 @@
-= Node.js 12 - Jenkins agent
+= Node.js 20 - Jenkins agent
 
 == Introduction
 This agent is used to build Node.js-based projects, through `npm` or `yarn`.
 
-The image is built in the global `ods` project and is named `jenkins-agent-nodejs12`.
-It can be referenced in a `Jenkinsfile` with `ods/jenkins-agent-nodejs12`.
+The image is built in the global `ods` project and is named `jenkins-agent-nodejs20`.
+It can be referenced in a `Jenkinsfile` with `ods/jenkins-agent-nodejs20`.
 
-CAUTION: Node.js version 12 reaches end-of-life in 2022-04-30. It is not recommended to start a new project using this agent. Existing projects should be migrated to a newer version, e.g. xref:jenkins-agents:nodejs16.adoc[Node.js 16]. Next releases will remove support for version 12.
+IMPORTANT: Node.js version 20 reaches end-of-life in 2026-04-30. Support for this version will be removed in releases after this date. Please consider switching to newer versions of this agent as soon as they are available.
 
 == Features
 1. Nexus configuration