Skip to content

Commit

Permalink
Remove nodejs12 (opendevstack#977)
Browse files Browse the repository at this point in the history
  • Loading branch information
BraisVQ authored Dec 12, 2023
1 parent 54e23f0 commit 0597a29
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 285 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- 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))
Expand Down
14 changes: 3 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions common/jenkins-agents/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
78 changes: 0 additions & 78 deletions common/jenkins-agents/nodejs12/docker/Dockerfile.ubi8

This file was deleted.

63 changes: 0 additions & 63 deletions common/jenkins-agents/nodejs12/docker/contrib/bin/configure-agent

This file was deleted.

3 changes: 0 additions & 3 deletions common/jenkins-agents/nodejs12/docker/contrib/bin/scl_enable

This file was deleted.

13 changes: 0 additions & 13 deletions common/jenkins-agents/nodejs12/docker/yum.repos.d/centos8.repo

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions common/jenkins-agents/nodejs12/ocp-config/Tailorfile

This file was deleted.

66 changes: 0 additions & 66 deletions common/jenkins-agents/nodejs12/ocp-config/bc.yml

This file was deleted.

14 changes: 0 additions & 14 deletions common/jenkins-agents/nodejs12/ocp-config/is.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/quickstarters/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
*** xref:jenkins-agents:golang.adoc[Go]
*** xref:jenkins-agents:inf-terraform.adoc[terraform]
*** xref:jenkins-agents:jdk.adoc[jdk]
*** xref:jenkins-agents:nodejs12.adoc[Node.js 12]
*** xref:jenkins-agents:nodejs16.adoc[Node.js 16]
*** xref:jenkins-agents:nodejs18.adoc[Node.js 18]
*** xref:jenkins-agents:nodejs20.adoc[Node.js 20]
*** xref:jenkins-agents:python.adoc[Python]
*** xref:jenkins-agents:scala.adoc[Scala]
** xref:quickstarters:authoring-quickstarters.adoc[Authoring Quickstarters]

0 comments on commit 0597a29

Please sign in to comment.