diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 096efe1a4..0e92353bd 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -65,8 +65,8 @@ jobs: --build-arg nexusPassword=s3cr3t \ . - jenkins-agent-nodejs12-centos7: - name: Jenkins agent NodeJS 12 (CENTOS7) + jenkins-agent-nodejs16-centos7: + name: Jenkins agent NodeJS 16 (CENTOS7) runs-on: ubuntu-18.04 steps: - @@ -74,15 +74,15 @@ jobs: uses: actions/checkout@v2.0.0 - name: Build docker image - working-directory: common/jenkins-agents/nodejs12/docker + working-directory: common/jenkins-agents/nodejs16/docker run: | - docker build --tag agent-nodejs12-test-centos7 --file Dockerfile.centos7 \ + docker build --tag agent-nodejs16-test-centos7 --file Dockerfile.centos7 \ --build-arg nexusUrl=https://nexus.example.com \ --build-arg nexusAuth=developer:s3cr3t \ . - jenkins-agent-nodejs12-ubi8: - name: Jenkins agent NodeJS 12 (UBI8) + jenkins-agent-nodejs16-ubi8: + name: Jenkins agent NodeJS 16 (UBI8) runs-on: ubuntu-18.04 steps: - @@ -90,9 +90,9 @@ jobs: uses: actions/checkout@v2.0.0 - name: Build docker image - working-directory: common/jenkins-agents/nodejs12/docker + working-directory: common/jenkins-agents/nodejs16/docker run: | - docker build --tag agent-nodejs12-test-ubi8 --file Dockerfile.ubi8 \ + docker build --tag agent-nodejs16-test-ubi8 --file Dockerfile.ubi8 \ --build-arg nexusUrl=https://nexus.example.com \ --build-arg nexusAuth=developer:s3cr3t \ . diff --git a/CHANGELOG.md b/CHANGELOG.md index 287520857..b2a0ececf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ - 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)) +- replaced nodeJS 12 builder agent with nodeJS 16 builder agent ([#763](https://github.com/opendevstack/ods-quickstarters/issues/763) ## [4.0] - 2021-11-05 diff --git a/Makefile b/Makefile index bb01e2ec6..26dc6d4e3 100644 --- a/Makefile +++ b/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-maven install-jenkins-agent-nodejs12 install-jenkins-agent-python install-jenkins-agent-scala install-jenkins-agent-terraform +install-jenkins-agent: install-jenkins-agent-golang install-jenkins-agent-maven install-jenkins-agent-nodejs16 install-jenkins-agent-python install-jenkins-agent-scala install-jenkins-agent-terraform .PHONY: install-jenkins-agent ## Update OpenShift resources related Jenkins agent resources. -apply-jenkins-agent-build: apply-jenkins-agent-golang-build apply-jenkins-agent-maven-build apply-jenkins-agent-nodejs12-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-maven-build apply-jenkins-agent-nodejs16-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-maven-build start-jenkins-agent-nodejs12-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-maven-build start-jenkins-agent-nodejs16-build start-jenkins-agent-python-build start-jenkins-agent-scala-build start-jenkins-agent-terraform-build .PHONY: start-jenkins-agent-build @@ -54,18 +54,18 @@ start-jenkins-agent-maven-build: # JENKINS AGENT NODEJS ## Install or update Jenkins Node agent resources. -install-jenkins-agent-nodejs12: apply-jenkins-agent-nodejs12-build start-jenkins-agent-nodejs12-build -.PHONY: install-jenkins-agent-nodejs12 +install-jenkins-agent-nodejs16: apply-jenkins-agent-nodejs16-build start-jenkins-agent-nodejs16-build +.PHONY: install-jenkins-agent-nodejs16 ## 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 - -## Start build of BuildConfig "jenkins-agent-nodejs12". -start-jenkins-agent-nodejs12-build: - oc -n $(ODS_NAMESPACE) start-build jenkins-agent-nodejs12 --follow -.PHONY: start-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 + +## 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 # JENKINS AGENT PYTHON diff --git a/be-typescript-express/Jenkinsfile b/be-typescript-express/Jenkinsfile index 7d8a2ede6..6e13f8f74 100644 --- 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 index cedb4cd8e..82e9e2a6d 100644 --- 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/common/jenkins-agents/README.md b/common/jenkins-agents/README.md index 82f1fb639..c01930321 100644 --- a/common/jenkins-agents/README.md +++ b/common/jenkins-agents/README.md @@ -17,7 +17,7 @@ The ODS [jenkins shared library](https://github.com/opendevstack/ods-jenkins-sha 1. [GoLang](golang) 2. [Maven / Gradle](maven) -3. [Node.js 12](nodejs12) +3. [Node.js 16](nodejs16) 5. [Python](python) 6. [Scala & SBT](scala) 7. [Terraform](terraform) diff --git a/common/jenkins-agents/nodejs12/docker/Dockerfile.centos7 b/common/jenkins-agents/nodejs16/docker/Dockerfile.centos7 similarity index 95% rename from common/jenkins-agents/nodejs12/docker/Dockerfile.centos7 rename to common/jenkins-agents/nodejs16/docker/Dockerfile.centos7 index 8a609710a..568d7f135 100644 --- a/common/jenkins-agents/nodejs12/docker/Dockerfile.centos7 +++ b/common/jenkins-agents/nodejs16/docker/Dockerfile.centos7 @@ -12,7 +12,7 @@ LABEL com.redhat.component="jenkins-agent-nodejs-rhel7-docker" \ ARG nexusUrl ARG nexusAuth -ENV NODEJS_VERSION=12 \ +ENV NODEJS_VERSION=16 \ NPM_CONFIG_PREFIX=$HOME/.npm-global \ PATH=$HOME/node_modules/.bin/:$HOME/.npm-global/bin/:$PATH \ BASH_ENV=/usr/local/bin/scl_enable \ @@ -20,7 +20,7 @@ ENV NODEJS_VERSION=12 \ PROMPT_COMMAND=". /usr/local/bin/scl_enable" \ LANG=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 \ - CHROME_VERSION=94.0.4606.81 + CHROME_VERSION=99.0.4844.74 # install google-chrome (for angular) RUN yum-config-manager --enable rhel-7-server-extras-rpms && \ @@ -58,7 +58,7 @@ COPY contrib/bin/scl_enable /usr/local/bin/scl_enable # Install NodeJS # https://github.com/nodesource/distributions#installation-instructions-1 -RUN curl --silent --location https://rpm.nodesource.com/setup_12.x | bash - && \ +RUN curl --silent --location https://rpm.nodesource.com/setup_${NODEJS_VERSION}.x | bash - && \ yum install -y nodejs && \ yum install -y gcc-c++ make diff --git a/common/jenkins-agents/nodejs12/docker/Dockerfile.ubi8 b/common/jenkins-agents/nodejs16/docker/Dockerfile.ubi8 similarity index 89% rename from common/jenkins-agents/nodejs12/docker/Dockerfile.ubi8 rename to common/jenkins-agents/nodejs16/docker/Dockerfile.ubi8 index 8974808ce..479d16cd0 100644 --- a/common/jenkins-agents/nodejs12/docker/Dockerfile.ubi8 +++ b/common/jenkins-agents/nodejs16/docker/Dockerfile.ubi8 @@ -1,8 +1,8 @@ FROM opendevstackorg/ods-jenkins-agent-base-ubi8:latest # Labels consumed by Red Hat build service -LABEL com.redhat.component="jenkins-agent-nodejs-12-rhel7-container" \ - name="openshift4/jenkins-agent-nodejs-12-rhel7" \ +LABEL com.redhat.component="jenkins-agent-nodejs-16-rhel7-container" \ + name="openshift4/jenkins-agent-nodejs-16-rhel7" \ architecture="x86_64" \ io.k8s.display-name="Jenkins Agent Nodejs" \ io.k8s.description="The jenkins agent nodejs image has the nodejs tools on top of the jenkins slave base image." \ @@ -12,8 +12,8 @@ LABEL com.redhat.component="jenkins-agent-nodejs-12-rhel7-container" \ ARG nexusUrl ARG nexusAuth -ENV NODEJS_VERSION=12 \ - YARN_VERSION=1.22.5 \ +ENV NODEJS_VERSION=16 \ + YARN_VERSION=1.22.18 \ NPM_CONFIG_PREFIX=$HOME/.npm-global \ PATH=$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$HOME/node_modules/.bin/:$HOME/.npm-global/bin/:$PATH \ LANG=en_US.UTF-8 \ @@ -24,7 +24,7 @@ COPY contrib/bin/configure-agent /usr/local/bin/configure-agent # Generate machine ID RUN dbus-uuidgen > /etc/machine-id -# Install NodeJS (https://rpm.nodesource.com/setup_12.x does NOT work) +# Install NodeJS (https://rpm.nodesource.com/setup_${NODEJS_VERSION}.x does NOT work) RUN INSTALL_PKGS="nodejs nodejs-nodemon make gcc-c++" && \ yum module enable -y nodejs:${NODEJS_VERSION} && \ yum install -y --setopt=tsflags=nodocs --disableplugin=subscription-manager $INSTALL_PKGS && \ diff --git a/common/jenkins-agents/nodejs12/docker/contrib/bin/configure-agent b/common/jenkins-agents/nodejs16/docker/contrib/bin/configure-agent similarity index 100% rename from common/jenkins-agents/nodejs12/docker/contrib/bin/configure-agent rename to common/jenkins-agents/nodejs16/docker/contrib/bin/configure-agent diff --git a/common/jenkins-agents/nodejs12/docker/contrib/bin/scl_enable b/common/jenkins-agents/nodejs16/docker/contrib/bin/scl_enable similarity index 71% rename from common/jenkins-agents/nodejs12/docker/contrib/bin/scl_enable rename to common/jenkins-agents/nodejs16/docker/contrib/bin/scl_enable index d2276ab84..a4363c6a2 100644 --- a/common/jenkins-agents/nodejs12/docker/contrib/bin/scl_enable +++ b/common/jenkins-agents/nodejs16/docker/contrib/bin/scl_enable @@ -1,3 +1,3 @@ # This will make scl collection binaries work out of box. unset BASH_ENV PROMPT_COMMAND ENV -source scl_source enable rh-nodejs12 +source scl_source enable rh-nodejs16 diff --git a/common/jenkins-agents/nodejs12/docker/yum.repos.d/centos8.repo b/common/jenkins-agents/nodejs16/docker/yum.repos.d/centos8.repo similarity index 100% rename from common/jenkins-agents/nodejs12/docker/yum.repos.d/centos8.repo rename to common/jenkins-agents/nodejs16/docker/yum.repos.d/centos8.repo diff --git a/common/jenkins-agents/nodejs12/docker/yum.repos.d/google-chrome.repo b/common/jenkins-agents/nodejs16/docker/yum.repos.d/google-chrome.repo similarity index 100% rename from common/jenkins-agents/nodejs12/docker/yum.repos.d/google-chrome.repo rename to common/jenkins-agents/nodejs16/docker/yum.repos.d/google-chrome.repo diff --git a/common/jenkins-agents/nodejs12/ocp-config/Tailorfile b/common/jenkins-agents/nodejs16/ocp-config/Tailorfile similarity index 75% rename from common/jenkins-agents/nodejs12/ocp-config/Tailorfile rename to common/jenkins-agents/nodejs16/ocp-config/Tailorfile index df8c9844a..9c6d41445 100644 --- a/common/jenkins-agents/nodejs12/ocp-config/Tailorfile +++ b/common/jenkins-agents/nodejs16/ocp-config/Tailorfile @@ -1,5 +1,5 @@ namespace ods -selector app=jenkins-agent-nodejs12 +selector app=jenkins-agent-nodejs16 param-file ../../../../../ods-configuration/ods-core.env ignore-unknown-parameters true bc,is diff --git a/common/jenkins-agents/nodejs12/ocp-config/bc.yml b/common/jenkins-agents/nodejs16/ocp-config/bc.yml similarity index 87% rename from common/jenkins-agents/nodejs12/ocp-config/bc.yml rename to common/jenkins-agents/nodejs16/ocp-config/bc.yml index 3ef9b3af0..d757f6901 100644 --- a/common/jenkins-agents/nodejs12/ocp-config/bc.yml +++ b/common/jenkins-agents/nodejs16/ocp-config/bc.yml @@ -1,7 +1,7 @@ apiVersion: template.openshift.io/v1 kind: Template metadata: - name: jenkins-agent-nodejs12 + name: jenkins-agent-nodejs16 parameters: - name: ODS_BITBUCKET_PROJECT description: Bitbucket project name. @@ -24,16 +24,16 @@ objects: - apiVersion: v1 kind: BuildConfig metadata: - name: jenkins-agent-nodejs12 + name: jenkins-agent-nodejs16 labels: - app: jenkins-agent-nodejs12 + app: jenkins-agent-nodejs16 spec: failedBuildsHistoryLimit: 5 nodeSelector: null output: to: kind: ImageStreamTag - name: jenkins-agent-nodejs12:${ODS_IMAGE_TAG} + name: jenkins-agent-nodejs16:${ODS_IMAGE_TAG} postCommit: {} resources: limits: @@ -44,7 +44,7 @@ objects: memory: "1Gi" runPolicy: Serial source: - contextDir: common/jenkins-agents/nodejs12/docker + contextDir: common/jenkins-agents/nodejs16/docker git: ref: ${ODS_GIT_REF} uri: ${REPO_BASE}/${ODS_BITBUCKET_PROJECT}/ods-quickstarters.git diff --git a/common/jenkins-agents/nodejs12/ocp-config/is.yml b/common/jenkins-agents/nodejs16/ocp-config/is.yml similarity index 64% rename from common/jenkins-agents/nodejs12/ocp-config/is.yml rename to common/jenkins-agents/nodejs16/ocp-config/is.yml index 2e5c6d636..7d086690d 100644 --- a/common/jenkins-agents/nodejs12/ocp-config/is.yml +++ b/common/jenkins-agents/nodejs16/ocp-config/is.yml @@ -1,14 +1,14 @@ apiVersion: template.openshift.io/v1 kind: Template metadata: - name: jenkins-agent-nodejs12 + name: jenkins-agent-nodejs16 objects: - apiVersion: v1 kind: ImageStream metadata: - name: jenkins-agent-nodejs12 + name: jenkins-agent-nodejs16 labels: - app: jenkins-agent-nodejs12 + app: jenkins-agent-nodejs16 spec: lookupPolicy: local: false diff --git a/docs/modules/jenkins-agents/pages/nodejs12.adoc b/docs/modules/jenkins-agents/pages/nodejs16.adoc similarity index 85% rename from docs/modules/jenkins-agents/pages/nodejs12.adoc rename to docs/modules/jenkins-agents/pages/nodejs16.adoc index d22790de3..51ba9d0ff 100644 --- a/docs/modules/jenkins-agents/pages/nodejs12.adoc +++ b/docs/modules/jenkins-agents/pages/nodejs16.adoc @@ -1,10 +1,10 @@ -= Nodejs 12 - Jenkins agent += Nodejs 16 - Jenkins agent == Introduction This agent is used to build Nodejs 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-nodejs16`. +It can be referenced in a `Jenkinsfile` with `ods/jenkins-agent-nodejs16`. == Features 1. Nexus configuration diff --git a/docs/modules/quickstarters/nav.adoc b/docs/modules/quickstarters/nav.adoc index f4f0bfbf9..f3ad3bc07 100644 --- a/docs/modules/quickstarters/nav.adoc +++ b/docs/modules/quickstarters/nav.adoc @@ -17,7 +17,7 @@ *** xref:jenkins:agent-base.adoc[Base Image] *** xref:jenkins-agents:golang.adoc[Go] *** xref:jenkins-agents:maven.adoc[Maven] -*** xref:jenkins-agents:nodejs12.adoc[Nodejs12 Angular] +*** xref:jenkins-agents:nodejs16.adoc[NodeJS 16] *** xref:jenkins-agents:python.adoc[Python] *** xref:jenkins-agents:scala.adoc[Scala] ** xref:quickstarters:authoring-quickstarters.adoc[Authoring Quickstarters] diff --git a/docs/modules/quickstarters/pages/be-typescript-express.adoc b/docs/modules/quickstarters/pages/be-typescript-express.adoc index a02129c66..0a40ca82e 100644 --- a/docs/modules/quickstarters/pages/be-typescript-express.adoc +++ b/docs/modules/quickstarters/pages/be-typescript-express.adoc @@ -89,7 +89,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. +https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs16[NodeJS 16 builder agent] Jenkins builder agent. == Known limitations diff --git a/docs/modules/quickstarters/pages/e2e-cypress.adoc b/docs/modules/quickstarters/pages/e2e-cypress.adoc index b9d3366de..4b97eafcf 100644 --- a/docs/modules/quickstarters/pages/e2e-cypress.adoc +++ b/docs/modules/quickstarters/pages/e2e-cypress.adoc @@ -76,7 +76,7 @@ In Jenkinsfile, there is the following stage: == Builder agent used This quickstarter uses -https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs12[Nodejs12 builder agent] Jenkins builder agent. +https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs16[NodeJS 16 builder agent] Jenkins builder agent. == Known limitations diff --git a/docs/modules/quickstarters/pages/fe-angular.adoc b/docs/modules/quickstarters/pages/fe-angular.adoc index 4da8a399c..5a78f6831 100644 --- a/docs/modules/quickstarters/pages/fe-angular.adoc +++ b/docs/modules/quickstarters/pages/fe-angular.adoc @@ -97,7 +97,7 @@ Please note: By default the applciation is always build as full production build == Builder agent used This quickstarter uses -https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs12[Nodejs12 builder agent] Jenkins builder agent. +https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs16[NodeJS 16 builder agent] Jenkins builder agent. == Known limitations diff --git a/docs/modules/quickstarters/pages/fe-ionic.adoc b/docs/modules/quickstarters/pages/fe-ionic.adoc index d900f0a2d..58f447d97 100644 --- a/docs/modules/quickstarters/pages/fe-ionic.adoc +++ b/docs/modules/quickstarters/pages/fe-ionic.adoc @@ -115,7 +115,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. +https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/nodejs16[NodeJS 16 builder agent] Jenkins builder agent. == Known Limitation diff --git a/e2e-cypress/Jenkinsfile b/e2e-cypress/Jenkinsfile index 9defe0829..7e40c0f8c 100644 --- a/e2e-cypress/Jenkinsfile +++ b/e2e-cypress/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 -> odsQuickstarterStageCopyFiles(context) diff --git a/e2e-cypress/Jenkinsfile.template b/e2e-cypress/Jenkinsfile.template index cc353ea33..0e9bf8b2d 100644 --- a/e2e-cypress/Jenkinsfile.template +++ b/e2e-cypress/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-angular/Jenkinsfile b/fe-angular/Jenkinsfile index 84f6425ec..1527e1dc7 100644 --- a/fe-angular/Jenkinsfile +++ b/fe-angular/Jenkinsfile @@ -17,7 +17,7 @@ library("ods-jenkins-shared-library@${sharedLibraryRef}") def angularCliVersion = "8.0.3" 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 index fa1823b26..7d7f92f7b 100644 --- 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 index afe9bfc1d..8db9cd8b9 100644 --- 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 index 2bbd66d18..bc4e9e19d 100644 --- 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'