From dfa0a5b0498172d2624d14d29bddc5e8299130c0 Mon Sep 17 00:00:00 2001
From: keshavprasadms <msknext@gmail.com>
Date: Tue, 3 Sep 2019 17:02:09 +0530
Subject: [PATCH] fix: typos and missed code updates
---
.../cassandra-deploy/Jenkinsfile.decrypt | 2 +-
pipelines/deploy/keycloak/Jenkinsfile.user | 3 +-
.../org_sunbird_questionunit_quml/Jenkinsfile | 34 ++++---------------
pipelines/deploy/player-cdn/Jenkinsfile | 3 +-
pipelines/deploy/yarn/Jenkinsfile | 25 ++------------
pipelines/reloadConfigurations/Jenkinsfile | 2 +-
6 files changed, 14 insertions(+), 55 deletions(-)
diff --git a/pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt b/pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt
index 5992224b4..4467112b5 100644
--- a/pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt
+++ b/pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt
@@ -30,7 +30,7 @@ node() {
values.put('ansibleExtraArgs', ansibleExtraArgs)
println values
ansible_playbook_run(values)
- currentBuild.result = 'SUCCESS'
+ currentBuild.result = 'SUCCESS'
archiveArtifacts artifacts: "${artifact}", fingerprint: true, onlyIfSuccessful: true
archiveArtifacts artifacts: 'metadata.json', onlyIfSuccessful: true
currentBuild.description = "Artifact: ${values.artifact_version}, Private: ${params.private_branch}, Public: ${params.branch_or_tag}"
diff --git a/pipelines/deploy/keycloak/Jenkinsfile.user b/pipelines/deploy/keycloak/Jenkinsfile.user
index 3fceb35b1..a0824d8d8 100644
--- a/pipelines/deploy/keycloak/Jenkinsfile.user
+++ b/pipelines/deploy/keycloak/Jenkinsfile.user
@@ -30,12 +30,11 @@ node() {
artifact_path=${currentWs}/${artifact}"
--vault-password-file /var/lib/jenkins/secrets/vault-pass
""".stripIndent().replace("\n", " ")
-
values.put('ansiblePlaybook', ansiblePlaybook)
values.put('ansibleExtraArgs', ansibleExtraArgs)
println values
ansible_playbook_run(values)
- currentBuild.result = 'SUCCESS'
+ currentBuild.result = 'SUCCESS'
archiveArtifacts artifacts: "${artifact}", fingerprint: true, onlyIfSuccessful: true
archiveArtifacts artifacts: 'metadata.json', onlyIfSuccessful: true
currentBuild.description = "Artifact: ${values.artifact_version}, Private: ${params.private_branch}, Public: ${params.branch_or_tag}"
diff --git a/pipelines/deploy/org_sunbird_questionunit_quml/Jenkinsfile b/pipelines/deploy/org_sunbird_questionunit_quml/Jenkinsfile
index 7ce4e0a45..8640ece28 100644
--- a/pipelines/deploy/org_sunbird_questionunit_quml/Jenkinsfile
+++ b/pipelines/deploy/org_sunbird_questionunit_quml/Jenkinsfile
@@ -19,26 +19,8 @@ node() {
currentWs = sh(returnStdout: true, script: 'pwd').trim()
artifact = values.artifact_name + ":" + values.artifact_version
values.put('currentWs', currentWs)
- if (params.artifact_source == "ArtifactRepo") {
- println(ANSI_BOLD + ANSI_YELLOW + '''\
- Option chosen is ArtifactRepo, ignoring any previously copied artifacts and new artifacts will be downloaded from remote source
- '''.stripIndent().replace("\n", " ") + ANSI_NORMAL)
- ansiblePlaybook = "${currentWs}/ansible/artifacts-download.yml"
- ansibleExtraArgs = """\
- --extra-vars "artifact=${artifact}
- artifact_path=${currentWs}/${artifact}"
- --vault-password-file /var/lib/jenkins/secrets/vault-pass
- """.stripIndent().replace("\n", " ")
- values.put('ansiblePlaybook', ansiblePlaybook)
- values.put('ansibleExtraArgs', ansibleExtraArgs)
- ansible_playbook_run(values)
- currentBuild.result = 'SUCCESS'
- }
- else{
- println(ANSI_BOLD + ANSI_YELLOW + '''\
- Option chosen is JenkinsJob, using the artifacts copied
- '''.stripIndent().replace("\n", " ") + ANSI_NORMAL)
- }
+ values.put('artifact', artifact)
+ artifact_download(values)
}
stage('deploy artifact'){
sh """
@@ -47,15 +29,13 @@ node() {
chmod a+x content-plugins/az_copy.sh
mv content-plugins ansible
"""
-
ansiblePlaybook = "${currentWs}/ansible/plugin.yml"
ansibleExtraArgs = "--tags org_sunbird_questionunit_quml --extra-vars \" plugins_name=${params.plugin_name} source_file=${currentWs}/ansible/content-plugins/${params.plugin_name}\" --vault-password-file /var/lib/jenkins/secrets/vault-pass"
- values.put('ansiblePlaybook', ansiblePlaybook)
- values.put('ansibleExtraArgs', ansibleExtraArgs)
- println values
- ansible_playbook_run(values)
- currentBuild.result = 'SUCCESS'
-
+ values.put('ansiblePlaybook', ansiblePlaybook)
+ values.put('ansibleExtraArgs', ansibleExtraArgs)
+ println values
+ ansible_playbook_run(values)
+ currentBuild.result = 'SUCCESS'
archiveArtifacts artifacts: "${artifact}", fingerprint: true, onlyIfSuccessful: true
archiveArtifacts artifacts: 'metadata.json', onlyIfSuccessful: true
currentBuild.description = "Artifact: ${values.artifact_version}, Private: ${params.private_branch}, Public: ${params.branch_or_tag}"
diff --git a/pipelines/deploy/player-cdn/Jenkinsfile b/pipelines/deploy/player-cdn/Jenkinsfile
index 2d6cfa343..788ad6ec6 100644
--- a/pipelines/deploy/player-cdn/Jenkinsfile
+++ b/pipelines/deploy/player-cdn/Jenkinsfile
@@ -21,7 +21,6 @@ node() {
values.put('ansiblePlaybook', ansiblePlaybook)
values.put('ansibleExtraArgs', ansibleExtraArgs)
ansible_playbook_run(values)
- currentBuild.result = 'SUCCESS'
}
stage('Deploy CDN') {
@@ -41,7 +40,7 @@ node() {
ansibleExtraArgs = "--extra-vars assets=$currentWs/sunbird-portal/src/app/dist --extra-vars cdn_file_path=$currentWs/sunbird-portal/src/app/dist/index_cdn.ejs --vault-password-file /var/lib/jenkins/secrets/vault-pass"
values.put('ansibleExtraArgs', ansibleExtraArgs)
ansible_playbook_run(values)
- currentBuild.result = 'SUCCESS'
+ currentBuild.result = 'SUCCESS'
archiveArtifacts 'metadata.json, sunbird-portal/src/app/dist/index_cdn.ejs'
currentBuild.description = "Image: " + values.image_tag + ", CDNHash: " + commitHash + "Private: ${params.private_branch}, Public: ${params.branch_or_tag}"
}
diff --git a/pipelines/deploy/yarn/Jenkinsfile b/pipelines/deploy/yarn/Jenkinsfile
index 0fda41ddb..1a74d8825 100644
--- a/pipelines/deploy/yarn/Jenkinsfile
+++ b/pipelines/deploy/yarn/Jenkinsfile
@@ -18,26 +18,8 @@ node() {
currentWs = sh(returnStdout: true, script: 'pwd').trim()
artifact = values.artifact_name + ":" + values.artifact_version
values.put('currentWs', currentWs)
- if (params.artifact_source == "ArtifactRepo") {
- println(ANSI_BOLD + ANSI_YELLOW + '''\
- Option chosen is ArtifactRepo, ignoring any previously copied artifacts and new artifacts will be downloaded from remote source
- '''.stripIndent().replace("\n", " ") + ANSI_NORMAL)
- ansiblePlaybook = "${currentWs}/ansible/artifacts-download.yml"
- ansibleExtraArgs = """\
- --extra-vars "artifact=${artifact}
- artifact_path=${currentWs}/${artifact}"
- --vault-password-file /var/lib/jenkins/secrets/vault-pass
- """.stripIndent().replace("\n", " ")
- values.put('ansiblePlaybook', ansiblePlaybook)
- values.put('ansibleExtraArgs', ansibleExtraArgs)
- ansible_playbook_run(values)
- currentBuild.result = 'SUCCESS'
- }
- else{
- println(ANSI_BOLD + ANSI_YELLOW + '''\
- Option chosen is JenkinsJob, using the artifacts copied
- '''.stripIndent().replace("\n", " ") + ANSI_NORMAL)
- }
+ values.put('artifact', artifact)
+ artifact_download(values)
}
stage('deploy artifact'){
sh """
@@ -46,7 +28,6 @@ node() {
rm -rf ansible/roles/samza-jobs/files/jobs
mkdir ansible/roles/samza-jobs/files/jobs
tar -xvf ansible/distribution-* -C ansible/roles/samza-jobs/files/jobs/
-
"""
ansiblePlaybook = "${currentWs}/ansible/samza_deploy.yml"
ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass"
@@ -54,7 +35,7 @@ node() {
values.put('ansibleExtraArgs', ansibleExtraArgs)
println values
ansible_playbook_run(values)
- currentBuild.result = 'SUCCESS'
+ currentBuild.result = 'SUCCESS'
archiveArtifacts artifacts: "${artifact}", fingerprint: true, onlyIfSuccessful: true
archiveArtifacts artifacts: 'metadata.json', onlyIfSuccessful: true
diff --git a/pipelines/reloadConfigurations/Jenkinsfile b/pipelines/reloadConfigurations/Jenkinsfile
index 6eb15ea69..8e9f19e3e 100644
--- a/pipelines/reloadConfigurations/Jenkinsfile
+++ b/pipelines/reloadConfigurations/Jenkinsfile
@@ -20,7 +20,7 @@ node() {
jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
currentWs = sh(returnStdout: true, script: 'pwd').trim()
ansiblePlaybook = "${currentWs}/ansible/reloadconfig.yml"
- ansibleExtraArgs = " --tags ${params.service} --vault-password-file /var/lib/jenkins/secrets/vault-pass -vvv"
+ ansibleExtraArgs = " --tags ${params.service} --vault-password-file /var/lib/jenkins/secrets/vault-pass -vvv"
values.put('currentWs', currentWs)
values.put('env', envDir)
values.put('module', module)
--
GitLab