switch fe-angular, fe-ionic and be-typescript-express to Node.js 16

opendevstack · Apr 7, 2022 · ed13ac6 · ed13ac6
1 parent 8fe09e0
commit ed13ac6
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - Use Java 17 (LTS) in maven jenkins-agent and spring boot qs ([#651](https://github.com/opendevstack/ods-quickstarters/pull/651))
 - ODS AMI build fails due to failing jacoco report generation in springboot quickstarter ([#700](https://github.com/opendevstack/ods-quickstarters/pull/700))
 - terraform agent sops/age added ([#730](https://github.com/opendevstack/ods-quickstarters/issues/730))
-- add Node.js 16 builder agent ([#763](https://github.com/opendevstack/ods-quickstarters/issues/763)
+- Add Node.js 16 builder agent ([#763](https://github.com/opendevstack/ods-quickstarters/issues/763)
 
 ### Fixed
 
@@ -33,10 +33,11 @@
 - Enforce use of secure Log4j version in SpringBoot Quickstarter ([#693](https://github.com/opendevstack/ods-quickstarters/issues/693))
 - inf-terraform-aws: Update versions for ruby, terraform, kitchen-terraform, Gemfile ([#677](https://github.com/opendevstack/ods-quickstarters/issues/677))
 - jupyter lab: reduction to a minimal initial env ([#710](https://github.com/opendevstack/ods-quickstarters/issues/710))
-- upgrade python flask quickstarter to Flask 2 version and general dependencies upgrades ([#746](https://github.com/opendevstack/ods-quickstarters/issues/746))
+- Upgrade python flask quickstarter to Flask 2 version and general dependencies upgrades ([#746](https://github.com/opendevstack/ods-quickstarters/issues/746))
 - AWS Quickstarter is using the new odsComponentStageInfrastructure concept now  ([#631](https://github.com/opendevstack/ods-quickstarters/issues/631))
-- update fe-angular to Angular 13.3.0 ([#765](https://github.com/opendevstack/ods-quickstarters/issues/765))
+- Update fe-angular to Angular 13.3.0 ([#765](https://github.com/opendevstack/ods-quickstarters/issues/765))
 - AWS Quickstarter enable devcontainer support for inf-terraform-aws ([#736](https://github.com/opendevstack/ods-quickstarters/issues/736))
+- Switch fe-angular, fe-ionic and be-typescript-express to Node.js 16 builder agent ([#763](https://github.com/opendevstack/ods-quickstarters/issues/763)
 
 ## [4.0] - 2021-11-05
 

diff --git a/be-typescript-express/Jenkinsfile b/be-typescript-express/Jenkinsfile
@@ -15,7 +15,7 @@ node {
 library("ods-jenkins-shared-library@${sharedLibraryRef}")
 
 odsQuickstarterPipeline(
-  imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs12:${agentImageTag}",
+  imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs16:${agentImageTag}",
 ) { context ->
 
   stage("init Project") {

diff --git a/be-typescript-express/Jenkinsfile.template b/be-typescript-express/Jenkinsfile.template
@@ -3,7 +3,7 @@
 @Library('ods-jenkins-shared-library@@shared_library_ref@') _
 
 odsComponentPipeline(
-  imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs12:@agent_image_tag@',
+  imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs16:@agent_image_tag@',
   branchToEnvironmentMapping: [
     'master': 'dev',
   // 'release/': 'test'

diff --git a/docs/modules/quickstarters/pages/be-typescript-express.adoc b/docs/modules/quickstarters/pages/be-typescript-express.adoc
@@ -2,7 +2,7 @@
 
 == Purpose of this quickstarter (use this when you want to ...)
 
-This is a https://nodejs.org/en/[node] (v10) quickstarter with https://expressjs.com/[express] using http://www.typescriptlang.org/[Typescript].
+This is a https://nodejs.org/en/[Node.js] (v16) quickstarter with https://expressjs.com/[express] using http://www.typescriptlang.org/[Typescript].
 If you are doing non-blocking operation and does not have heavy algorithm/Job which consumes lots of CPU power, this could be an ideal fit.
 It contains a basic setup for https://www.docker.com/[Docker], https://jenkins.io/[Jenkins], https://www.sonarqube.org/[SonarQube] and https://www.openshift.com/[OpenShift].
 
@@ -75,7 +75,7 @@ version: 1.0.1
 type: ods
 role: backend
 runtime: node
-runtimeVersion: 10.18
+runtimeVersion: 16
 ```
 
 
@@ -88,8 +88,7 @@ The build pipeline is defined in the `Jenkinsfile` in the project root. The main
 
 == Builder agent used
 
-This quickstarter uses
-https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs12[Nodejs12 builder agent] Jenkins builder agent.
+This quickstarter uses https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs16[Node.JS 16 builder agent] for Jenkins.
 
 == Known limitations
 

diff --git a/docs/modules/quickstarters/pages/fe-angular.adoc b/docs/modules/quickstarters/pages/fe-angular.adoc
@@ -49,11 +49,9 @@ User this is a Angular project quickstarter if you want to build a frontend. It
 
 This project is generated by https://cli.angular.io/[Angular CLI]
 
-******* https://cli.angular.io/[Angular CLI]
-
-******* https://angular.io/[Angular]
-
-******* http://www.typescriptlang.org/[Typescript]
+* https://cli.angular.io/[Angular CLI]
+* https://angular.io/[Angular]
+* https://www.typescriptlang.org/[TypeScript]
 
 == Usage - how do you start after you provisioned this quickstarter
 
@@ -90,8 +88,7 @@ Please note: The support for *TSLint* has been removed from this quickstarter. A
 
 == Builder agent used
 
-This quickstarter uses
-https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs12[Nodejs12 builder agent] Jenkins builder agent.
+This quickstarter uses https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs16[Node.js 16 builder agent] for Jenkins.
 
 == Known limitations
 

diff --git a/docs/modules/quickstarters/pages/fe-ionic.adoc b/docs/modules/quickstarters/pages/fe-ionic.adoc
@@ -114,8 +114,7 @@ When the code in your git repository is updated the `Jenkinsfile` comes into act
 
 == Builder agent used
 
-This quickstarter uses
-https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs12[Nodejs12 builder agent] Jenkins builder agent.
+This quickstarter uses https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs16[Node.js 16 builder agent] for Jenkins.
 
 == Known Limitation
 

diff --git a/fe-angular/Jenkinsfile b/fe-angular/Jenkinsfile
@@ -17,7 +17,7 @@ library("ods-jenkins-shared-library@${sharedLibraryRef}")
 def angularCliVersion = "13.3.0"
 
 odsQuickstarterPipeline(
-  imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs12:${agentImageTag}",
+  imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs16:${agentImageTag}",
 ) { context ->
 
   stage("update angular cli") {

diff --git a/fe-angular/Jenkinsfile.template b/fe-angular/Jenkinsfile.template
@@ -3,7 +3,7 @@
 @Library('ods-jenkins-shared-library@@shared_library_ref@') _
 
 odsComponentPipeline(
-  imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs12:@agent_image_tag@',
+  imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs16:@agent_image_tag@',
   branchToEnvironmentMapping: [
     'master': 'dev',
   // 'release/': 'test'

diff --git a/fe-ionic/Jenkinsfile b/fe-ionic/Jenkinsfile
@@ -18,7 +18,7 @@ def ionicVersion = "6.13.1"
 def eslintVersion = "7.24.0"
 
 odsQuickstarterPipeline(
-  imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs12:${agentImageTag}",
+  imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs16:${agentImageTag}",
 ) { context ->
 
   stage("update ionic cli") {

diff --git a/fe-ionic/Jenkinsfile.template b/fe-ionic/Jenkinsfile.template
@@ -3,7 +3,7 @@
 @Library('ods-jenkins-shared-library@@shared_library_ref@') _
 
 odsComponentPipeline(
-  imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs12:@agent_image_tag@',
+  imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs16:@agent_image_tag@',
   branchToEnvironmentMapping: [
     'master': 'dev',
   // 'release/': 'test'