|
|
@@ -50,20 +50,20 @@ node{
|
|
|
|
|
|
dir("${env.WORKSPACE}/angular-client")
|
|
|
{
|
|
|
- //sh 'npm i @angular-devkit/build-angular'
|
|
|
+ // sh 'npm i @angular-devkit/build-angular'
|
|
|
|
|
|
- try
|
|
|
- {
|
|
|
- sh 'npm run test-ci'
|
|
|
- }
|
|
|
- catch(err)
|
|
|
- {
|
|
|
- sh 'echo TEST FAILED'
|
|
|
- junit 'target/surefire-reports/TESTS-TestSuite.xml/*.xml'
|
|
|
- throw err
|
|
|
- }
|
|
|
+ // try
|
|
|
+ // {
|
|
|
+ // sh 'npm run test-ci'
|
|
|
+ // }
|
|
|
+ // catch(err)
|
|
|
+ // {
|
|
|
+ // sh 'echo TEST FAILED'
|
|
|
+ // junit 'target/surefire-reports/TESTS-TestSuite.xml/*.xml'
|
|
|
+ // throw err
|
|
|
+ // }
|
|
|
|
|
|
- /*def karma = docker.image('trion/ng-cli-karma')
|
|
|
+ def karma = docker.image('trion/ng-cli-karma')
|
|
|
karma.pull()
|
|
|
|
|
|
try
|
|
|
@@ -91,25 +91,9 @@ node{
|
|
|
{
|
|
|
sh 'echo RUN DOCKER FAILED'
|
|
|
throw err
|
|
|
- }*/
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- // stage('Build Angular PreProduction')
|
|
|
- // {
|
|
|
- // //sh 'docker build -f build/docker/apache/Dockerfile -t sample-app:0.1 angular-client/dist'
|
|
|
- // //sh 'docker run -d -p 8080:80 --name sample-app sample-app:0.1'
|
|
|
-
|
|
|
- // //imageApache=docker.build('server-apache-dev', '--no-cache -f build/docker/apache/Dockerfile .')
|
|
|
- // //containerApache=imageApache.run('-p 8080:80')
|
|
|
-
|
|
|
- // dir("${env.WORKSPACE}/angular-client")
|
|
|
- // {
|
|
|
- // //sh 'npm install'
|
|
|
- // //sh 'npm run-script build'
|
|
|
- // //sh 'npm install -g firebase-tools'
|
|
|
- // //sh 'firebase deploy --token 1//034mfWw9ZUdOKCgYIARAAGAMSNwF-L9Ir-Ql0JG0M9RA3PJStufMSA-2gEVAiyiu6_plL9KQdHn3kuIiNGBVuDQpotPgjltv4nWc'
|
|
|
- // }
|
|
|
- // }
|
|
|
|
|
|
|
|
|
def imageApache = stage("Build apache preprod")
|
