Merge pull request #347 from cultuurnet/feature/UPS-4076

Feature/ups 4076

Jenkinsfile

@@ -2,8 +2,9 @@ pipeline {
     agent none
 
     environment {
-        PIPELINE_VERSION            = build.pipelineVersion()
-        REPOSITORY_NAME             = 'uitpas-balie-frontend'
+        PIPELINE_VERSION = build.pipelineVersion()
+        REPOSITORY_NAME  = 'uitpas-balie-frontend'
+        QT_QPA_PLATFORM  = 'offscreen'
     }
 
     stages {
@@ -15,7 +16,7 @@ pipeline {
         }
 
         stage('Setup and build') {
-            agent { label 'ubuntu' && '16.04' && 'nodejs14' }
+            agent { label 'ubuntu' && '16.04' && 'nodejs16' }
             environment {
                 GIT_SHORT_COMMIT = build.shortCommitRef()
                 ARTIFACT_VERSION = "${env.PIPELINE_VERSION}" + '+sha.' + "${env.GIT_SHORT_COMMIT}"

lib/tasks/uitpas-balie-frontend/build.rake

@@ -8,12 +8,13 @@ namespace 'uitpas-balie-frontend' do
     configuration_hash = { 'basePath' => '/app/', 'buildNumber' => calver_version }
 
     system('npm install') or exit 1
-    system('bower install') or exit 1
 
-    system('angular_config hash -c config.dist.json > config.json') or exit 1
+    system('node_modules/bower/bin/bower install') or exit 1
+
+    system('angular_config hash -c config.dist.json > config.json')
     config = JSON.load File.new('config.json')
-    File.open('config.json', 'w') { |file| file.write(config.merge!(configuration_hash).to_json) } or exit 1
+    File.open('config.json', 'w') { |file| file.write(config.merge!(configuration_hash).to_json) }
 
-    system('grunt build') or exit 1
+    system('node_modules/grunt-cli/bin/grunt build') or exit 1
   end
 end

lib/tasks/uitpas-balie-frontend/build_artifact.rake

@@ -18,7 +18,7 @@ namespace 'uitpas-balie-frontend' do
       -C dist -d rubygem-anglular-config \
       -x '.git*' -x pkg -x vendor -x lib -x Rakefile -x Gemfile -x Gemfile.lock \
       -x .bundle -x 'Jenkinsfile*' \
-      --prefix /var/www/uitpas-balie-frontend/web/app \
+      --prefix /var/www/uitpas-balie-api/web/app \
       --before-remove lib/tasks/uitpas-balie-frontend/prerm \
       --deb-user www-data --deb-group www-data \
       --description '#{description}' --url '#{source}' --vendor '#{vendor}' \

lib/tasks/uitpas-balie-frontend/prerm

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-rm -rf /var/www/uitpas-balie-frontend/web/app/scripts/scripts.*.js
+rm -rf /var/www/uitpas-balie-api/web/app/scripts/scripts.*.js