From 65f308c8ddf4b522e220df97b06c760dc4619052 Mon Sep 17 00:00:00 2001 From: msknext Date: Thu, 7 Mar 2019 14:43:05 +0530 Subject: [PATCH 01/11] feat: DO-618 Jenkinsfile format and update --- .../pipelines/sunbird-auth-build/Jenkinsfile | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile diff --git a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile new file mode 100644 index 00000000..9a99e173 --- /dev/null +++ b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile @@ -0,0 +1,65 @@ +node('build-slave') { + try { + String ANSI_GREEN = "\u001B[32m" + String ANSI_NORMAL = "\u001B[0m" + String ANSI_BOLD = "\u001B[1m" + String ANSI_RED = "\u001B[31m" + String ANSI_YELLOW = "\u001B[33m" + + ansiColor('xterm') { + stage('Checkout') { + cleanWs() + def scmVars = checkout scm + if (params.github_release_tag == "") { + checkout scm + commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim() + branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim() + artifact_version = branch_name + "_" + commit_hash + println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag not specified, using the latest commit hash: " + commit_hash + ANSI_NORMAL) + } + else { + checkout scm: [$class: 'GitSCM', branches: [[name: "refs/tags/${params.github_release_tag}"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]] + artifact_version = params.github_release_tag + println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag specified, building from: " + params.github_release_tag + ANSI_NORMAL) + } + echo "artifact_version: "+ artifact_version + } + + + stage('Build') { + sh """ + mkdir -p sunbird_auth_1.0v/providers + mkdir -p sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main + mkdir -p sunbird_auth_1.0v/themes/sunbird/login + wget -P sunbird_auth_1.0v https://downloads.jboss.org/keycloak/3.2.0.Final/keycloak-3.2.0.Final.tar.gz + tar -xvf keycloak-3.2.0.Final.tar.gz --strip 1 + wget -P sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar + cd keycloak/sms-provider + mvn package + cp target/keycloak-email-phone-autthenticator-1.0-SNAPSHOT.jar $WORKSPACE/sunbird_auth_1.0v/providers + cp -r templates $WORKSPACE/sunbird_auth_1.0v/themes/sunbird/login + rm -rf $WORKSPACE/sunbird_auth_1.0v/keycloak-3.2.0.Final.tar.gz + zip sunbird_auth_1.0v.zip $WORKSPACE/sunbird_auth_1.0v + """ + } + + stage('ArchiveArtifacts') { + sh """ + mkdir keycloak_artifacts + cp sunbird_auth_1.0v.zip keycloak_artifacts + zip -j keycloak_artifacts.zip:${artifact_version} keycloak_artifacts/* + """ + archiveArtifacts artifacts: "keycloak_artifacts.zip:${artifact_version}", fingerprint: true, onlyIfSuccessful: true + sh """echo {\\"artifact_name\\" : \\"keycloak_artifacts.zip\\", \\"artifact_version\\" : \\"${artifact_version}\\", \\"node_name\\" : \\"${env.NODE_NAME}\\"} > metadata.json""" + archiveArtifacts "metadata.json" + currentBuild.description = "${build_tag}" + } + } + + } + catch (err) { + currentBuild.result = "FAILURE" + throw err + } + +} From 8dc338f2d535a039cb43ffa8d422a6e9af1ff53e Mon Sep 17 00:00:00 2001 From: msknext Date: Thu, 7 Mar 2019 14:52:12 +0530 Subject: [PATCH 02/11] feat: DO-618 Jenkinsfile format and update --- keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile index 9a99e173..1aa6fd09 100644 --- a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile +++ b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile @@ -32,7 +32,7 @@ node('build-slave') { mkdir -p sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main mkdir -p sunbird_auth_1.0v/themes/sunbird/login wget -P sunbird_auth_1.0v https://downloads.jboss.org/keycloak/3.2.0.Final/keycloak-3.2.0.Final.tar.gz - tar -xvf keycloak-3.2.0.Final.tar.gz --strip 1 + tar -xvf sunbird_auth_1.0v/keycloak-3.2.0.Final.tar.gz --strip 1 wget -P sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar cd keycloak/sms-provider mvn package From bbdc9acda8276157733b2f88692972daa24fab29 Mon Sep 17 00:00:00 2001 From: msknext Date: Thu, 7 Mar 2019 17:15:56 +0530 Subject: [PATCH 03/11] feat: DO-618 Updated archive logic --- keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile index 1aa6fd09..27d0e2cf 100644 --- a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile +++ b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile @@ -38,15 +38,13 @@ node('build-slave') { mvn package cp target/keycloak-email-phone-autthenticator-1.0-SNAPSHOT.jar $WORKSPACE/sunbird_auth_1.0v/providers cp -r templates $WORKSPACE/sunbird_auth_1.0v/themes/sunbird/login - rm -rf $WORKSPACE/sunbird_auth_1.0v/keycloak-3.2.0.Final.tar.gz - zip sunbird_auth_1.0v.zip $WORKSPACE/sunbird_auth_1.0v """ } stage('ArchiveArtifacts') { sh """ mkdir keycloak_artifacts - cp sunbird_auth_1.0v.zip keycloak_artifacts + mv sunbird_auth_1.0v.zip keycloak_artifacts zip -j keycloak_artifacts.zip:${artifact_version} keycloak_artifacts/* """ archiveArtifacts artifacts: "keycloak_artifacts.zip:${artifact_version}", fingerprint: true, onlyIfSuccessful: true From 495945ae6fc78c23c041c90a0e02e5f965eceac7 Mon Sep 17 00:00:00 2001 From: msknext Date: Thu, 7 Mar 2019 17:19:53 +0530 Subject: [PATCH 04/11] feat: DO-618 Move dir instead of zip --- keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile index 27d0e2cf..5dd2ca17 100644 --- a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile +++ b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile @@ -44,7 +44,7 @@ node('build-slave') { stage('ArchiveArtifacts') { sh """ mkdir keycloak_artifacts - mv sunbird_auth_1.0v.zip keycloak_artifacts + mv sunbird_auth_1.0v keycloak_artifacts zip -j keycloak_artifacts.zip:${artifact_version} keycloak_artifacts/* """ archiveArtifacts artifacts: "keycloak_artifacts.zip:${artifact_version}", fingerprint: true, onlyIfSuccessful: true From f534e73db8b1e4e736b598ebcc866fe538c79357 Mon Sep 17 00:00:00 2001 From: msknext Date: Thu, 7 Mar 2019 17:26:21 +0530 Subject: [PATCH 05/11] feat: DO-618 Move dir instead of zip --- keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile index 5dd2ca17..2b01a3ec 100644 --- a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile +++ b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile @@ -45,7 +45,7 @@ node('build-slave') { sh """ mkdir keycloak_artifacts mv sunbird_auth_1.0v keycloak_artifacts - zip -j keycloak_artifacts.zip:${artifact_version} keycloak_artifacts/* + zip -r -j keycloak_artifacts.zip:${artifact_version} keycloak_artifacts/* """ archiveArtifacts artifacts: "keycloak_artifacts.zip:${artifact_version}", fingerprint: true, onlyIfSuccessful: true sh """echo {\\"artifact_name\\" : \\"keycloak_artifacts.zip\\", \\"artifact_version\\" : \\"${artifact_version}\\", \\"node_name\\" : \\"${env.NODE_NAME}\\"} > metadata.json""" From 8eb5f6220c9efed71e4d87b09d89336ec3cca7a5 Mon Sep 17 00:00:00 2001 From: msknext Date: Thu, 7 Mar 2019 17:37:56 +0530 Subject: [PATCH 06/11] feat: DO-616 Reordering build steps --- .../scripts/pipelines/sunbird-auth-build/Jenkinsfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile index 2b01a3ec..d73257dd 100644 --- a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile +++ b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile @@ -1,4 +1,4 @@ -node('build-slave') { +nde('build-slave') { try { String ANSI_GREEN = "\u001B[32m" String ANSI_NORMAL = "\u001B[0m" @@ -28,12 +28,13 @@ node('build-slave') { stage('Build') { sh """ + wget https://downloads.jboss.org/keycloak/3.2.0.Final/keycloak-3.2.0.Final.tar.gz + tar -xvf sunbird_auth_1.0v/keycloak-3.2.0.Final.tar.gz --strip 1 -C sunbird_auth_1.0v mkdir -p sunbird_auth_1.0v/providers mkdir -p sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main mkdir -p sunbird_auth_1.0v/themes/sunbird/login - wget -P sunbird_auth_1.0v https://downloads.jboss.org/keycloak/3.2.0.Final/keycloak-3.2.0.Final.tar.gz - tar -xvf sunbird_auth_1.0v/keycloak-3.2.0.Final.tar.gz --strip 1 - wget -P sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar + wget https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar + mv postgresql-9.4.1212.jar sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main cd keycloak/sms-provider mvn package cp target/keycloak-email-phone-autthenticator-1.0-SNAPSHOT.jar $WORKSPACE/sunbird_auth_1.0v/providers From 36d1dc92f80255979545dc2a6fc4f02937011178 Mon Sep 17 00:00:00 2001 From: msknext Date: Thu, 7 Mar 2019 17:38:43 +0530 Subject: [PATCH 07/11] feat: Typo node --- keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile index d73257dd..f452c195 100644 --- a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile +++ b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile @@ -1,4 +1,4 @@ -nde('build-slave') { +node('build-slave') { try { String ANSI_GREEN = "\u001B[32m" String ANSI_NORMAL = "\u001B[0m" From 7543dc16e68192eb5b542a75101fcbe0d98415d3 Mon Sep 17 00:00:00 2001 From: msknext Date: Thu, 7 Mar 2019 17:45:17 +0530 Subject: [PATCH 08/11] feat: Typo in tar extract --- keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile index f452c195..d356d19b 100644 --- a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile +++ b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile @@ -29,7 +29,7 @@ node('build-slave') { stage('Build') { sh """ wget https://downloads.jboss.org/keycloak/3.2.0.Final/keycloak-3.2.0.Final.tar.gz - tar -xvf sunbird_auth_1.0v/keycloak-3.2.0.Final.tar.gz --strip 1 -C sunbird_auth_1.0v + tar -xvf keycloak-3.2.0.Final.tar.gz --strip 1 -C sunbird_auth_1.0v mkdir -p sunbird_auth_1.0v/providers mkdir -p sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main mkdir -p sunbird_auth_1.0v/themes/sunbird/login @@ -51,7 +51,7 @@ node('build-slave') { archiveArtifacts artifacts: "keycloak_artifacts.zip:${artifact_version}", fingerprint: true, onlyIfSuccessful: true sh """echo {\\"artifact_name\\" : \\"keycloak_artifacts.zip\\", \\"artifact_version\\" : \\"${artifact_version}\\", \\"node_name\\" : \\"${env.NODE_NAME}\\"} > metadata.json""" archiveArtifacts "metadata.json" - currentBuild.description = "${build_tag}" + currentBuild.description = "${artifact_version}" } } From ad6eb5498f4f6de6f0cf702cd868be48577fb140 Mon Sep 17 00:00:00 2001 From: msknext Date: Thu, 7 Mar 2019 17:46:38 +0530 Subject: [PATCH 09/11] feat: Type create dir --- keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile index d356d19b..71ad2bc7 100644 --- a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile +++ b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile @@ -28,7 +28,8 @@ node('build-slave') { stage('Build') { sh """ - wget https://downloads.jboss.org/keycloak/3.2.0.Final/keycloak-3.2.0.Final.tar.gz + mkdir sunbird_auth_1.0v + wget https://downloads.jboss.org/keycloak/3.2.0.Final/keycloak-3.2.0.Final.tar.gz tar -xvf keycloak-3.2.0.Final.tar.gz --strip 1 -C sunbird_auth_1.0v mkdir -p sunbird_auth_1.0v/providers mkdir -p sunbird_auth_1.0v/modules/system/layers/keycloak/org/postgresql/main From 9ecb39f9ba76d20a047f38df951a68c726a6200d Mon Sep 17 00:00:00 2001 From: msknext Date: Thu, 7 Mar 2019 18:03:53 +0530 Subject: [PATCH 10/11] feat: Updated zip logic --- keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile index 71ad2bc7..0c117880 100644 --- a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile +++ b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile @@ -46,8 +46,7 @@ node('build-slave') { stage('ArchiveArtifacts') { sh """ mkdir keycloak_artifacts - mv sunbird_auth_1.0v keycloak_artifacts - zip -r -j keycloak_artifacts.zip:${artifact_version} keycloak_artifacts/* + zip -r keycloak_artifacts.zip:${artifact_version} sunbird_auth_1.0v """ archiveArtifacts artifacts: "keycloak_artifacts.zip:${artifact_version}", fingerprint: true, onlyIfSuccessful: true sh """echo {\\"artifact_name\\" : \\"keycloak_artifacts.zip\\", \\"artifact_version\\" : \\"${artifact_version}\\", \\"node_name\\" : \\"${env.NODE_NAME}\\"} > metadata.json""" From fb25e34b69dd3f0cee4c131d7a702036ccc54859 Mon Sep 17 00:00:00 2001 From: msknext Date: Thu, 7 Mar 2019 18:09:48 +0530 Subject: [PATCH 11/11] feat: copy all under templates to login --- keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile index 0c117880..6505b047 100644 --- a/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile +++ b/keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile @@ -39,7 +39,7 @@ node('build-slave') { cd keycloak/sms-provider mvn package cp target/keycloak-email-phone-autthenticator-1.0-SNAPSHOT.jar $WORKSPACE/sunbird_auth_1.0v/providers - cp -r templates $WORKSPACE/sunbird_auth_1.0v/themes/sunbird/login + cp -r templates/* $WORKSPACE/sunbird_auth_1.0v/themes/sunbird/login """ }