removed deprecated versions

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

@@ -35,22 +35,6 @@ 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
@@ -132,19 +116,6 @@ jobs:
             --build-arg cargoDenyVersion=0.16.1 \
             .
 
-  jenkins-agent-terraform-ubi8:
-    name: Jenkins agent Terraform (UBI8)
-    runs-on: ubuntu-22.04
-    steps:
-      -
-        name: Checkout repository
-        uses: actions/[email protected]
-      -
-        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

CHANGELOG.md

@@ -24,6 +24,7 @@
 - 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 new function to cypress to log into applications using MFA ([#1070](https://github.com/opendevstack/ods-quickstarters/pull/1070))
+- Removal of deprecated versions ([#1068](https://github.com/opendevstack/ods-quickstarters/issues/1068))
 
 ### Added
 

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 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

common/jenkins-agents/README.md

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