Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed deprecated versions #1080

Merged
merged 2 commits into from
Dec 9, 2024
Merged

removed deprecated versions #1080

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a55eaed
removed deprecated versions
BraisVQ Nov 15, 2024
c6018eb
Merge branch 'master' into deprecation-node16-terraform
BraisVQ Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions .github/workflows/continuous-integration-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
34 changes: 4 additions & 30 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


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

Expand Down
64 changes: 0 additions & 64 deletions common/jenkins-agents/nodejs16/docker/Dockerfile.ubi8
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions common/jenkins-agents/nodejs16/docker/contrib/bin/configure-agent
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions common/jenkins-agents/nodejs16/docker/contrib/bin/scl_enable
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions common/jenkins-agents/nodejs16/docker/yum.repos.d/almalinux.repo
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions common/jenkins-agents/nodejs16/docker/yum.repos.d/google-chrome.repo
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions common/jenkins-agents/nodejs16/docker/yum.repos.d/microsoft-edge.repo
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions common/jenkins-agents/nodejs16/ocp-config/Tailorfile
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions common/jenkins-agents/nodejs16/ocp-config/bc.yml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions common/jenkins-agents/nodejs16/ocp-config/is.yml
View file
Open in desktop

This file was deleted.

Loading