diff --git a/Jenkinsfile b/Jenkinsfile
index 55492d4..41918bb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,6 @@
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.8.15'
+
pipeline {
agent { label 'linux' }
@@ -13,49 +16,41 @@ pipeline {
environment {
GIT_COMMITTER_NAME = 'status-im-auto'
GIT_COMMITTER_EMAIL = 'auto@status.im'
- PROD_SITE = 'assembly.logos.co'
- DEV_SITE = 'dev.assembly.logos.co'
- DEV_HOST = 'jenkins@node-01.do-ams3.sites.misc.statusim.net'
- SCP_OPTS = 'StrictHostKeyChecking=no'
}
stages {
stage('Install') {
steps {
- sh "yarn install"
+ sh 'yarn install'
}
}
stage('Build') {
- steps {
+ steps { script {
sh 'yarn build'
- sh "echo ${env.PROD_SITE} > build/CNAME"
- }
+ jenkins.genBuildMetaJSON('build/build.json')
+ } }
}
- stage('Publish Prod') {
- when { expression { env.GIT_BRANCH ==~ /.*master/ } }
+ stage('Publish') {
steps {
sshagent(credentials: ['status-im-auto-ssh']) {
- sh "ghp-import -p build"
- }
- }
- }
-
- stage('Publish Devel') {
- when { expression { env.GIT_BRANCH ==~ /.*develop/ } }
- steps {
- sshagent(credentials: ['jenkins-ssh']) {
sh """
- rsync -e 'ssh -o ${SCP_OPTS}' -r --delete build/. \
- ${env.DEV_HOST}:/var/www/${env.DEV_SITE}/
+ ghp-import \
+ -b ${deployBranch()} \
+ -c ${deployDomain()} \
+ -p build
"""
}
}
}
- }
+ }
post {
cleanup { cleanWs() }
}
}
+
+def isMasterBranch() { GIT_BRANCH ==~ /.*master/ }
+def deployBranch() { isMasterBranch() ? 'deploy-master' : 'deploy-develop' }
+def deployDomain() { isMasterBranch() ? 'assembly.logos.co' : 'dev-assembly.logos.co' }
diff --git a/README.md b/README.md
index 4f047c5..49f7184 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,12 @@ $ yarn serve
## CI/CD
-- The `master` branch is deployed to https://assembly.logos.co/ through [Jenkins CI](https://ci.infra.status.im/job/website/job/assembly.logos.co/).
-- The `develop` branch is deployed to https://dev.assembly.logos.co/ through [Jenkins CI](https://ci.infra.status.im/job/website/job/dev.assembly.logos.co/).
+- [CI builds](https://ci.infra.status.im/job/website/job/assembly.logos.co/) `master` and pushes to `deploy-master` branch, which is hosted at .
+- [CI builds](https://ci.infra.status.im/job/website/job/dev-assembly.logos.co/) `develop` and pushes to `deploy-develop` branch, which is hosted at .
+
+The hosting is done using [Caddy server with Git plugin for handling GitHub webhooks](https://github.com/status-im/infra-misc/blob/master/ansible/roles/caddy-git).
+
+Information about deployed build can be also found in `/build.json` available on the website.
## Change Process