From 55e53a62be0c6d5209eab25f8cb002bfef76742e Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Thu, 18 Jul 2019 16:30:03 -0400 Subject: [PATCH 1/5] Push latest remove unneeded var --- Jenkinsfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7e8554a..3ee4f0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,6 @@ pipeline { GITHUB_KEY = 'autosemverDeployKey' GITHUB_URL = 'https://github.com/RightBrain-Networks/auto-semver' DOCKER_REGISTRY = '356438515751.dkr.ecr.us-east-1.amazonaws.com' - VERSION = "" //Image tag to use for self-versioning @@ -78,6 +77,13 @@ pipeline { steps { withEcr { sh "docker push ${env.DOCKER_REGISTRY}/${env.SERVICE}:${env.VERSION}" + script + { + if("${env.BRANCH_NAME}" == "develop") + { + sh "docker push ${env.DOCKER_REGISTRY}/${env.SERVICE}:latest" + } + } } } From 96f7e29ba75134974ee0d8a21eab6552ec1baaad Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Thu, 18 Jul 2019 16:35:55 -0400 Subject: [PATCH 2/5] Testing latest --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3ee4f0f..43a60d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -79,7 +79,7 @@ pipeline { sh "docker push ${env.DOCKER_REGISTRY}/${env.SERVICE}:${env.VERSION}" script { - if("${env.BRANCH_NAME}" == "develop") + if("${env.BRANCH_NAME}" != "develop") { sh "docker push ${env.DOCKER_REGISTRY}/${env.SERVICE}:latest" } From 03c2ece9a20794f0d607869f0ff9143d1722a10a Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Thu, 18 Jul 2019 16:41:23 -0400 Subject: [PATCH 3/5] tag latest --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 43a60d1..2ba6340 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -81,6 +81,7 @@ pipeline { { if("${env.BRANCH_NAME}" != "develop") { + sh "docker tag ${env.DOCKER_REGISTRY}/${env.SERVICE}:${env.VERSION} ${env.DOCKER_REGISTRY}/${env.SERVICE}:latest" sh "docker push ${env.DOCKER_REGISTRY}/${env.SERVICE}:latest" } } From 081fe41c826bc3067b823612fbb0a28cf2e8e5c0 Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Thu, 18 Jul 2019 16:50:57 -0400 Subject: [PATCH 4/5] Fixed tagging, fixed self versioning, and push latest --- .bumpversion.cfg | 8 ++++---- Jenkinsfile | 6 +++--- VERSION | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9497194..e4a5bf9 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -6,11 +6,11 @@ tag_name = {new_version} message = Bump version: {current_version} -> {new_version} [bumpversion:file:semver.semver] -search = version = {current_version} -replace = version = {new_version} +search = __version__ = {current_version} +replace = __version__ = {new_version} [semver] -main_branches = develops, env-test, env-stage, env-prod +main_branches = develop major_branches = -minor_branches = feature, RightBrain-Networks/feature +minor_branches = feature patch_branches = hotfix, bugfix diff --git a/Jenkinsfile b/Jenkinsfile index 2ba6340..93c6ec3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,12 +6,12 @@ pipeline { environment { SERVICE = 'auto-semver' GITHUB_KEY = 'autosemverDeployKey' - GITHUB_URL = 'https://github.com/RightBrain-Networks/auto-semver' + GITHUB_URL = 'git@github.com:RightBrain-Networks/auto-semver.git' DOCKER_REGISTRY = '356438515751.dkr.ecr.us-east-1.amazonaws.com' //Image tag to use for self-versioning - SELF_SEMVER_TAG = "HEAD" + SELF_SEMVER_TAG = "bugfix.pipeline" } stages { @@ -79,7 +79,7 @@ pipeline { sh "docker push ${env.DOCKER_REGISTRY}/${env.SERVICE}:${env.VERSION}" script { - if("${env.BRANCH_NAME}" != "develop") + if("${env.BRANCH_NAME}" == "develop") { sh "docker tag ${env.DOCKER_REGISTRY}/${env.SERVICE}:${env.VERSION} ${env.DOCKER_REGISTRY}/${env.SERVICE}:latest" sh "docker push ${env.DOCKER_REGISTRY}/${env.SERVICE}:latest" diff --git a/VERSION b/VERSION index 71a5aa4..d93206f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -version=1.0.6 +__version__ = 1.0.6 \ No newline at end of file From 70bb018cc60ea7ad4cd1207f0618dd5a4b88b76f Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Thu, 1 Aug 2019 15:58:25 -0400 Subject: [PATCH 5/5] Ship to s# --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 93c6ec3..cc95322 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,7 +60,7 @@ pipeline { // Docker build flags are set via the getDockerBuildFlags() shared library. sh "docker build ${getDockerBuildFlags()} -t ${env.DOCKER_REGISTRY}/${env.SERVICE}:${env.VERSION} ." - //sh "tar -czvf ${env.SERVICE}-${getVersion('-d')}.tar.gz deployer" + sh "tar -czvf ${env.SERVICE}-${env.VERSION}.tar.gz . --exclude='./.git'" } post{ // Update Git with status of build stage. @@ -86,6 +86,7 @@ pipeline { } } } + sh "aws s3 cp dist/${env.SERVICE}-*.tar.gz s3://rbn-ops-pkg-us-east-1/${env.SERVICE}/${env.SERVICE}-${env.VERSION}.tar.gz" } post