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

Move theme to volto-industry-theme #29

Merged
merged 8 commits into from
Nov 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
66 changes: 5 additions & 61 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
508 changes: 273 additions & 235 deletions CHANGELOG.md

Large diffs are not rendered by default.

63 changes: 32 additions & 31 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
pipeline {
agent any

environment {
GIT_NAME="industry-frontend"
NAMESPACE = "@eeacms"
Expand All @@ -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') {
Expand Down Expand Up @@ -50,7 +48,7 @@ pipeline {
}
}
}

stage("Docker test build") {
when {
not {
Expand All @@ -77,12 +75,12 @@ pipeline {
}
}
}


}
}


stage('Pull Request') {
when {
not {
Expand All @@ -105,7 +103,7 @@ pipeline {
}
}


stage('Release') {
when {
allOf {
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)
}
}
}
}
}
134 changes: 0 additions & 134 deletions Makefile

This file was deleted.

Loading