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.

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

Update Node Quickstarters #972

Merged
merged 11 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- Maintenance for Golang Agent and QuickStarter ([#955](https://github.com/opendevstack/ods-quickstarters/issues/955))
- jenkins agents can not import private keys into gpg keyring to use with helm secrets ([#945](https://github.com/opendevstack/ods-quickstarters/issues/945))
- Streamlit quickstarter build fails to import nexus host certificates into truststore ([#951](https://github.com/opendevstack/ods-quickstarters/issues/951))
- Update Angular, TypeScript, Cypress and Ionic quickstarters ([#962](https://github.com/opendevstack/ods-quickstarters/issues/962))

## [4.3.0] - 2023-07-13

Expand Down
13 changes: 7 additions & 6 deletions be-typescript-express/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ node {
library("ods-jenkins-shared-library@${sharedLibraryRef}")

odsQuickstarterPipeline(
imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs18:${agentImageTag}",
imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs20:${agentImageTag}",
) { context ->

stage("init Project") {
Expand All @@ -24,13 +24,14 @@ odsQuickstarterPipeline(
sh "npm init -y"

print "Install dependencies"
def typescriptVersion = "5.0.2"
def nodeTypeVersion = "18.15.10"
def typescriptVersion = "5.3.2"
def nodeTypeVersion = "20.10.0"
def expressVersion = "4.18.2"
def jestVersion = "29.5.0"
def jestJunitVersion = "15.0.0"
def jestVersion = "29.7.0"
def jestTypeVersion = "29.5.10"
def jestJunitVersion = "16.0.0"

sh "npm i typescript@$typescriptVersion express@$expressVersion @types/node@$nodeTypeVersion jest@$jestVersion @types/jest@$jestVersion"
sh "npm i typescript@$typescriptVersion express@$expressVersion @types/node@$nodeTypeVersion jest@$jestVersion @types/jest@$jestTypeVersion"
sh "npm i jest-junit@$jestJunitVersion --save-dev"

print "Generate ts config file. Skip library check and redirect transpiled ts files to dist folder."
Expand Down
2 changes: 1 addition & 1 deletion be-typescript-express/Jenkinsfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@Library('ods-jenkins-shared-library@@shared_library_ref@') _

odsComponentPipeline(
imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs18:@agent_image_tag@',
imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs20:@agent_image_tag@',
branchToEnvironmentMapping: [
'master': 'dev',
// 'release/': 'test'
Expand Down
2 changes: 1 addition & 1 deletion be-typescript-express/files/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-alpine
FROM node:20-alpine

COPY dist /node

Expand Down
2 changes: 1 addition & 1 deletion be-typescript-express/files/metadata.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: TypeScript
description: "TypeScript is an open-source programming language developed and maintained by Microsoft. It is a strict syntactical superset of JavaScript, and adds optional static typing to the language. TypeScript is designed for development of large applications and transcompiles to JavaScript. Technologies: TypeScript unpinned, Node 10.18"
description: "TypeScript is an open-source programming language developed and maintained by Microsoft. It is a strict syntactical superset of JavaScript, and adds optional static typing to the language. TypeScript is designed for development of large applications and transcompiles to JavaScript. Technologies: TypeScript unpinned, Node 20"
supplier: https://www.typescriptlang.org
version: 4.x
type: ods
2 changes: 1 addition & 1 deletion e2e-cypress/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ node {
library("ods-jenkins-shared-library@${sharedLibraryRef}")

odsQuickstarterPipeline(
imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs18:${agentImageTag}",
imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs20:${agentImageTag}",
) { context ->

odsQuickstarterStageCopyFiles(context)
Expand Down
2 changes: 1 addition & 1 deletion e2e-cypress/Jenkinsfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ odsComponentPipeline(
podContainers: [
containerTemplate(
name: 'jnlp',
image: "${dockerRegistry}/ods/jenkins-agent-nodejs18:@shared_library_ref@",
image: "${dockerRegistry}/ods/jenkins-agent-nodejs20:@agent_image_tag@",
workingDir: '/tmp',
envVars: [
envVar(key: 'CYPRESS_RECORD_KEY', value: cypressRecordKey)
Expand Down
2 changes: 1 addition & 1 deletion e2e-cypress/files/metadata.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Cypress
description: "Cypress is a JavaScript-based end-to-end testing framework. It is built on top of Mocha, which is again a feature-rich JavaScript test framework running on and in the browser, making asynchronous testing simple and fun. Technologies: Cypress 9.5, TypeScript 4.6"
description: "Cypress is a JavaScript-based end-to-end testing framework. It is built on top of Mocha, which is again a feature-rich JavaScript test framework running on and in the browser, making asynchronous testing simple and fun. Technologies: Cypress 13.x, TypeScript 5.x"
supplier: https://www.cypress.io
version: 4.x
type: ods-test
10 changes: 5 additions & 5 deletions e2e-cypress/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
},
"private": true,
"devDependencies": {
"@types/node": "^17.0.23",
"cypress": "^12.9.0",
"@types/node": "^20.10.0",
"cypress": "^13.6.0",
"cypress-junit-reporter": "^1.3.1",
"junit-report-merger": "^5.0.0",
"junit-report-merger": "^6.0.3",
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2",
"typescript": "^4.6.3"
"rimraf": "^5.0.5",
"typescript": "^5.3.2"
}
}
5 changes: 3 additions & 2 deletions fe-angular/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ node {

library("ods-jenkins-shared-library@${sharedLibraryRef}")

def angularCliVersion = "15.2.7"
def angularCliVersion = "17.0.3"
//def angularCliVersion = "16.2.10"

odsQuickstarterPipeline(
imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs18:${agentImageTag}",
imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs20:${agentImageTag}",
) { context ->

stage("update angular cli") {
Expand Down
4 changes: 2 additions & 2 deletions fe-angular/Jenkinsfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@Library('ods-jenkins-shared-library@@shared_library_ref@') _

odsComponentPipeline(
imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs18:@agent_image_tag@',
imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs20:@agent_image_tag@',
branchToEnvironmentMapping: [
'master': 'dev',
// 'release/': 'test'
Expand All @@ -28,7 +28,7 @@ def stageBuild(def context) {
sh 'npm run build -- --source-map=true'
}
}
sh "cp -r dist/${context.componentId} docker/dist"
sh "cp -r dist/angular docker/dist"
}
}

Expand Down
2 changes: 1 addition & 1 deletion fe-angular/files/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.24.0-alpine
FROM nginx:1.25.3-alpine

RUN chmod -R 777 /var/log/nginx /var/cache/nginx /var/run \
&& chgrp -R 0 /etc/nginx \
Expand Down
2 changes: 1 addition & 1 deletion fe-angular/files/metadata.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Angular
description: "Angular is a TypeScript-based open-source web application framework led by the Angular Team at Google and by a community of individuals and corporations. Technologies: Angular 8.0"
description: "Angular is a TypeScript-based open-source web application framework led by the Angular Team at Google and by a community of individuals and corporations. Technologies: Angular 17.0"
supplier: https://angular.io
version: 4.x
type: ods
4 changes: 2 additions & 2 deletions fe-ionic/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ node {

library("ods-jenkins-shared-library@${sharedLibraryRef}")

def ionicVersion = "7.1.1"
def ionicVersion = "7.1.5"

odsQuickstarterPipeline(
imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs18:${agentImageTag}",
imageStreamTag: "${odsNamespace}/jenkins-agent-nodejs20:${agentImageTag}",
resourceRequestMemory: '1Gi',
resourceLimitMemory: '2Gi',
) { context ->
Expand Down
4 changes: 2 additions & 2 deletions fe-ionic/Jenkinsfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@Library('ods-jenkins-shared-library@@shared_library_ref@') _

odsComponentPipeline(
imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs18:@agent_image_tag@',
imageStreamTag: '@ods_namespace@/jenkins-agent-nodejs20:@agent_image_tag@',
branchToEnvironmentMapping: [
'master': 'dev',
// 'release/': 'test'
Expand All @@ -22,7 +22,7 @@ odsComponentPipeline(
def stageBuild(def context) {
stage('Build') {
withEnv(["TAGVERSION=${context.tagversion}", "NEXUS_HOST=${context.nexusHost}"]) {
sh 'npm i -g @ionic/[email protected].1'
sh 'npm i -g @ionic/[email protected].5'
sh 'npm install'
if ('master'.equals(context.gitBranch)) {
sh 'ionic build --prod'
Expand Down
2 changes: 1 addition & 1 deletion fe-ionic/files/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.24.0-alpine
FROM nginx:1.25.3-alpine

RUN chmod -R 777 /var/log/nginx /var/cache/nginx /var/run \
&& chgrp -R 0 /etc/nginx \
Expand Down
2 changes: 1 addition & 1 deletion fe-ionic/files/metadata.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Ionic
description: "Ionic Framework is the free, open source mobile UI toolkit for developing high-quality cross-platform apps for native iOS, Android, and the web—all from a single codebase. Technologies: Ionic 6.19.x"
description: "Ionic Framework is the free, open source mobile UI toolkit for developing high-quality cross-platform apps for native iOS, Android, and the web—all from a single codebase. Technologies: Ionic 7.1.5"
supplier: https://ionicframework.com
type: ods
version: 7.1.x
Loading