Skip to content
Snippets Groups Projects
Commit 64f779ed authored by OZGCloud's avatar OZGCloud
Browse files

revert jenkinsfile/package.json

parent 8241bbc1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Jenkinsfile
+ 8
− 8
View file @ 64f779ed
pipeline {
agent {
node {
label 'jenkins-build-agent-nodejs-16'
label 'jenkins-build-agent'
}
}
......@@ -63,7 +63,7 @@ pipeline {
sh 'npm --version'
dir('goofy-client') {
sh 'echo "registry=https://nexus.ozg-sh.de/repository/npm-proxy" >> ~/.npmrc'
sh 'echo "//nexus.ozg-sh.de/:_auth=amVua2luczpQaihzX0ZNNFU5ZC8=" >> ~/.npmrc'
sh 'echo "_auth=amVua2luczpQaihzX0ZNNFU5ZC8=" >> ~/.npmrc'
sh 'npm cache verify'
sh 'npm install --legacy-peer-deps'
......@@ -178,7 +178,7 @@ pipeline {
}
}
}
stage('Test, build and deploy Helm Chart') {
steps {
script {
......@@ -206,11 +206,11 @@ pipeline {
script {
if(currentBuild.changeSets.size() > 0) {
FAILED_STAGE = env.STAGE_NAME
checkoutProvisioningRepo()
setNewGoofyProvisioningVersion('dev')
pushNewProvisioningVersion('dev')
}
else {
......@@ -338,7 +338,7 @@ pipeline {
}
}
Void deployHelmChart(String helmChartVersion) {
Void deployHelmChart(String helmChartVersion) {
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){
if (env.BRANCH_NAME == 'release') {
result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@goofy-'''+helmChartVersion+'''.tgz''', returnStdout: true
......@@ -672,7 +672,7 @@ String generateCypressConfig(String stage, String bezeichner, String testFolder,
environment = config.env
environment.put("search", elasticsearchEnv)
environment.put("userManager", getUserManagerEnv(namespace, dbPort));
writeJSON file: configName, json: config
......
goofy-client/package.json
+ 42
− 43
View file @ 64f779ed
......@@ -48,62 +48,62 @@
},
"private": true,
"dependencies": {
"@angular/animations": "14.2.12",
"@angular/cdk": "14.2.7",
"@angular/common": "14.2.12",
"@angular/compiler": "14.2.12",
"@angular/core": "14.2.12",
"@angular/forms": "14.2.12",
"@angular/material": "14.2.7",
"@angular/material-date-fns-adapter": "14.2.7",
"@angular/platform-browser": "14.2.12",
"@angular/platform-browser-dynamic": "14.2.12",
"@angular/router": "14.2.12",
"@angular/animations": "14.1.2",
"@angular/cdk": "14.1.1",
"@angular/common": "14.1.2",
"@angular/compiler": "14.1.2",
"@angular/core": "14.1.2",
"@angular/forms": "14.1.2",
"@angular/material": "14.1.1",
"@angular/material-date-fns-adapter": "14.1.1",
"@angular/platform-browser": "14.1.2",
"@angular/platform-browser-dynamic": "14.1.2",
"@angular/router": "14.1.2",
"@ngrx/component-store": "14.0.2",
"@ngrx/effects": "14.0.2",
"@ngrx/entity": "14.0.2",
"@ngrx/router-store": "14.0.2",
"@ngrx/store": "14.0.2",
"@ngxp/rest": "7.0.1",
"@nrwl/angular": "14.8.6",
"@ngxp/rest": "6.0.0",
"@nrwl/angular": "14.5.4",
"angular-oauth2-oidc": "13.0.1",
"angular-oauth2-oidc-jwks": "13.0.1",
"date-fns": "^2.28.0",
"file-saver": "2.0.5",
"include-media": "^1.4.10",
"lodash-es": "4.17.21",
"rxjs": "^6.6.0",
"rxjs": "~6.6.0",
"tslib": "^2.0.0",
"typeface-roboto": "1.1.13",
"zone.js": "0.11.5"
},
"devDependencies": {
"@angular-devkit/build-angular": "14.2.10",
"@angular-eslint/eslint-plugin": "14.0.4",
"@angular-eslint/eslint-plugin-template": "14.0.4",
"@angular-eslint/template-parser": "14.0.4",
"@angular/cli": "~14.2.0",
"@angular/compiler-cli": "14.2.12",
"@angular/language-service": "14.2.12",
"@angular-devkit/build-angular": "14.1.2",
"@angular-eslint/eslint-plugin": "14.0.2",
"@angular-eslint/eslint-plugin-template": "14.0.2",
"@angular-eslint/template-parser": "14.0.2",
"@angular/cli": "~14.1.0",
"@angular/compiler-cli": "14.1.2",
"@angular/language-service": "14.1.2",
"@bahmutov/cypress-extends": "1.1.0",
"@cypress/webpack-batteries-included-preprocessor": "^2.2.3",
"@cypress/webpack-preprocessor": "^5.11.1",
"@faker-js/faker": "^6.3.1",
"@ngrx/schematics": "14.0.2",
"@ngrx/store-devtools": "14.0.2",
"@nrwl/cli": "14.8.6",
"@nrwl/cypress": "14.8.6",
"@nrwl/eslint-plugin-nx": "14.8.6",
"@nrwl/jest": "14.8.6",
"@nrwl/linter": "14.8.6",
"@nrwl/workspace": "14.8.6",
"@nrwl/cli": "14.5.4",
"@nrwl/cypress": "14.5.4",
"@nrwl/eslint-plugin-nx": "14.5.4",
"@nrwl/jest": "14.5.4",
"@nrwl/linter": "14.5.4",
"@nrwl/workspace": "14.5.4",
"@testing-library/jest-dom": "5.16.4",
"@types/file-saver": "2.0.5",
"@types/jest": "28.1.8",
"@types/jest": "27.4.1",
"@types/lodash-es": "4.17.6",
"@types/node": "^16.18.1",
"@typescript-eslint/eslint-plugin": "5.44.0",
"@typescript-eslint/parser": "5.44.0",
"@types/node": "14.14.33",
"@typescript-eslint/eslint-plugin": "5.33.0",
"@typescript-eslint/parser": "5.33.0",
"codelyzer": "6.0.2",
"cypress": "^9.1.0",
"cypress-file-upload": "5.0.8",
......@@ -113,21 +113,20 @@
"eslint-config-prettier": "8.3.0",
"eslint-plugin-cypress": "2.11.3",
"jasmine-marbles": "~0.8.3",
"jest": "28.1.3",
"jest-createspyobj": "^2.0.0",
"jest-environment-jsdom": "28.1.1",
"jest-junit": "^14.0.0",
"jest-marbles": "3.0.3",
"jest-preset-angular": "12.2.2",
"jest-sonar-reporter": "^2.0.0",
"jest": "27.5.1",
"jest-createspyobj": "2.0.0",
"jest-junit": "14.0.0",
"jest-marbles": "3.0.1",
"jest-preset-angular": "11.1.2",
"jest-sonar-reporter": "2.0.0",
"mongodb": "4.5.0",
"ng-mocks": "^14.1.0",
"nx": "14.8.6",
"ng-mocks": "14.1.0",
"nx": "14.5.4",
"prettier": "2.7.1",
"sonarqube-scanner": "2.8.1",
"ts-jest": "28.0.8",
"ts-node": "10.9.1",
"typescript": "4.8.4"
"ts-jest": "27.1.4",
"ts-node": "10.8.2",
"typescript": "4.7.4"
},
"optionalDependencies": {
"cypress": "9.4.1"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit