Merge pull request #30 from eea/develop

Move theme to volto-industry-theme

.gitignore

@@ -1,75 +1,19 @@
-# Logs
+.vscode/
 logs
 *.log
 npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
 .DS_Store
 
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
 coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-# next.js build output
-.next
-
+node_modules
 build
 .env.local
 .env.development.local
 .env.test.local
 .env.production.local
 
 data
-*.old
-*~
+omelette
+
 src/addons
-src/develop
-npm-cache
+src/develop

CHANGELOG.md

@@ -4,8 +4,31 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [3.1.0](https://github.com/eea/industry-frontend/compare/3.0.0-beta.0...3.1.0)
+
+- Move theme to volto-industry-theme [`#29`](https://github.com/eea/industry-frontend/pull/29)
+- Update [`3a818a8`](https://github.com/eea/industry-frontend/commit/3a818a88013a99f2a5550b4676d79cc6e00a0f73)
+- Release @eeacms/volto-industry-theme@0.1.2 [`6b9a283`](https://github.com/eea/industry-frontend/commit/6b9a283df781eac24bc5c922d1602322a8511993)
+- Merge develop into refactor [`eeccd5d`](https://github.com/eea/industry-frontend/commit/eeccd5d9ff5978c5f7c52c5a7bca1e196322f740)
+- Release @eeacms/volto-embed@2.0.8 [`3f4734e`](https://github.com/eea/industry-frontend/commit/3f4734efbd26930073436db9be1a8d7d82910036)
+
+#### [3.0.0-beta.0](https://github.com/eea/industry-frontend/compare/2.10.0...3.0.0-beta.0)
+
+> 1 November 2021
+
+- Release 3.0.0-beta.0 [`e804ab2`](https://github.com/eea/industry-frontend/commit/e804ab20485e41da206ea8e75f20aae8d3712b5f)
+- Added jsconfig.json.tpl [`5fe971c`](https://github.com/eea/industry-frontend/commit/5fe971caae23989981dc5879ff57d2da17203f73)
+- Use latest volto-industry-theme [`86210ba`](https://github.com/eea/industry-frontend/commit/86210baf55bf3b6d46b6e444d6bad2d1ea02b987)
+- Update [`da3cf12`](https://github.com/eea/industry-frontend/commit/da3cf125ac6b78a5f915c987508f59bc41802e82)
+- Removed addons folder [`9d563a6`](https://github.com/eea/industry-frontend/commit/9d563a6e4bb9951bc3fdd15368ec7f7ec0976c2c)
+- Update [`7a1c10a`](https://github.com/eea/industry-frontend/commit/7a1c10afd7dc9bcad8bd6ca6f162c09e9170c51d)
+- Move theme to volto-industry-theme [`996ed9a`](https://github.com/eea/industry-frontend/commit/996ed9aee35e338e4a0efe184ddfe2ff4e67d653)
+
 #### [2.10.0](https://github.com/eea/industry-frontend/compare/2.9.0...2.10.0)
 
+> 25 October 2021
+
+- Develop updated mrs.developers [`#27`](https://github.com/eea/industry-frontend/pull/27)
 - Update mrs.developer.json [`d0458e6`](https://github.com/eea/industry-frontend/commit/d0458e6133b5961320e7c1e52e6cb7f1107d671b)
 - Removed conf setup via ENVs [`0ffe14b`](https://github.com/eea/industry-frontend/commit/0ffe14b74b3201fe8040ba9efeb532f2ce90c6ee)
 

Jenkinsfile

@@ -1,6 +1,4 @@
 pipeline {
-  agent any
-
   environment {
     GIT_NAME="industry-frontend"
     NAMESPACE = "@eeacms"
@@ -10,18 +8,18 @@ pipeline {
     RANCHER_ENVID = "1a332957"
     dockerImage = ''
     tagName = ''
-    SONARQUBE_TAG = ""
+    SONARQUBE_TAG = 'https://industry.eea.europa.eu/'
   }
 
-
+  agent any
 
   stages {
 
-   stage('Integration tests') {
+    stage('Integration tests') {
       parallel {
-        stage('Cypress') {
+        stage('Integration with Cypress') {
           when {
-            environment name: 'CHANGE_ID', value: ''           
+            environment name: 'CHANGE_ID', value: ''
           }
           steps {
             node(label: 'docker') {
@@ -50,7 +48,7 @@ pipeline {
             }
           }
         }
-        
+
         stage("Docker test build") {
              when {
                not {
@@ -77,12 +75,12 @@ pipeline {
                }
              }
           }
-          
-        
+
+
       }
     }
 
-    
+
     stage('Pull Request') {
       when {
         not {
@@ -105,7 +103,7 @@ pipeline {
       }
     }
 
-  
+
     stage('Release') {
       when {
         allOf {
@@ -142,26 +140,26 @@ pipeline {
                 dockerImage.push()
               }
             } finally {
-              sh script: "docker rmi $registry:$tagName", returnStatus: true
+              sh "docker rmi $registry:$tagName"
             }
           }
         }
       }
     }
-    
+
     stage('Release catalog ( on tag )') {
       when {
         buildingTag()
       }
       steps{
         node(label: 'docker') {
-          withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),  usernamePassword(credentialsId: 'jekinsdockerhub', usernameVariable: 'DOCKERHUB_USER', passwordVariable: 'DOCKERHUB_PASS')]) {
-           sh '''docker pull eeacms/gitflow; docker run -i --rm --name="$BUILD_TAG-release"  -e GIT_BRANCH="$BRANCH_NAME" -e GIT_NAME="$GIT_NAME" -e DOCKERHUB_REPO="$registry" -e GIT_TOKEN="$GITHUB_TOKEN" -e DOCKERHUB_USER="$DOCKERHUB_USER" -e DOCKERHUB_PASS="$DOCKERHUB_PASS"  -e RANCHER_CATALOG_PATHS="$template" -e GITFLOW_BEHAVIOR="RUN_ON_TAG" eeacms/gitflow'''
-          }
+          withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) {
+           sh '''docker pull eeacms/gitflow; docker run -i --rm --name="${BUILD_TAG}-release" -e GIT_TOKEN="${GITHUB_TOKEN}" -e RANCHER_CATALOG_PATH="${template}" -e DOCKER_IMAGEVERSION="${BRANCH_NAME}" -e DOCKER_IMAGENAME="${registry}" --entrypoint /add_rancher_catalog_entry.sh eeacms/gitflow'''
+         }
         }
       }
     }
-    
+
     stage('Upgrade demo ( on tag )') {
       when {
         buildingTag()
@@ -198,23 +196,26 @@ pipeline {
   }
 
 
+
   post {
-    always {
-      cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
-    }
     changed {
       script {
-        def details = """<h1>${env.JOB_NAME} - Build #${env.BUILD_NUMBER} - ${currentBuild.currentResult}</h1>
-                         <p>Check console output at <a href="${env.BUILD_URL}/display/redirect">${env.JOB_BASE_NAME} - #${env.BUILD_NUMBER}</a></p>
+        def url = "${env.BUILD_URL}/display/redirect"
+        def status = currentBuild.currentResult
+        def subject = "${status}: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'"
+        def summary = "${subject} (${url})"
+        def details = """<h1>${env.JOB_NAME} - Build #${env.BUILD_NUMBER} - ${status}</h1>
+                         <p>Check console output at <a href="${url}">${env.JOB_BASE_NAME} - #${env.BUILD_NUMBER}</a></p>
                       """
-        emailext(
-        subject: '$DEFAULT_SUBJECT',
-        body: details,
-        attachLog: true,
-        compressLog: true,
-        recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'CulpritsRecipientProvider']]
-        )
+
+        def color = '#FFFF00'
+        if (status == 'SUCCESS') {
+          color = '#00FF00'
+        } else if (status == 'FAILURE') {
+          color = '#FF0000'
+        }
+        emailext (subject: '$DEFAULT_SUBJECT', to: '$DEFAULT_RECIPIENTS', body: details)
       }
     }
   }
-}
+}