Merge pull request #795 from project-sunbird/test-241_RC1

Fixes from 2.4.0
Sunbird-Knowlg · Dec 3, 2019 · 7828f28 · 7828f28
2 parents 7d5597d + ed217d7
commit 7828f28
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 22 deletions.
diff --git a/ansible/es_azure_plugin.yml b/ansible/es_azure_plugin.yml
@@ -18,7 +18,7 @@
 
     - name: Install plugin
       shell: ES_PATH_CONF=/etc/elasticsearch/"{{ es_instance_name }}" /usr/share/elasticsearch/bin/elasticsearch-plugin install repository-azure
-      when: plugin_output.stdout_lines[0] != "repository-azure"
+      when: (plugin_output.stdout_lines | length == 0) or (plugin_output.stdout_lines[0] != "repository-azure")
 
     - name: add azure storage details in config file
       become: yes

diff --git a/ansible/lp_learning_neo4j_provision.yml b/ansible/lp_learning_neo4j_provision.yml
@@ -1,3 +1,8 @@
+- import_playbook: artifacts-download.yml
+  vars:
+    artifact: "{{ neo4j_zip }}"
+    artifact_path: "{{ playbook_dir }}/artifacts/{{ artifact }}"
+
 - hosts: learning-neo4j-cluster
   vars_files:
     - "{{inventory_dir}}/secrets.yml"

diff --git a/ansible/lp_yarn_provision.yml b/ansible/lp_yarn_provision.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: lp-yarn
+- hosts: yarn
   become: yes
   vars_files:
     - "{{inventory_dir}}/secrets.yml"
@@ -17,14 +17,12 @@
         shell: /bin/bash
 
 - name: Install samza job server
-  hosts: "lp-yarn-master"
+  hosts: "yarn-master"
   vars_files:
     - "{{inventory_dir}}/secrets.yml"
   become: yes
-  vars_files:
-    - "{{inventory_dir}}/secrets/lp_secrets.yml"
   roles:
-    - java
+    - jdk-1.8.0_121
     - yarn
     - samza-job-server
 
@@ -40,12 +38,10 @@
 #     - include: ./roles/yarn/templates
 
 - name: Install java on all yarn slaves
-  hosts: "lp-yarn-slave"
+  hosts: "yarn-slave"
   vars_files:
     - "{{inventory_dir}}/secrets.yml"
   become: yes
-  vars_files:
-    - "{{inventory_dir}}/secrets/lp_secrets.yml"
   remote_user: hduser
   roles:
-    - java
+    - jdk-1.8.0_121
diff --git a/ansible/roles/yarn/templates/hadoop-env.sh b/ansible/roles/yarn/templates/hadoop-env.sh
@@ -1 +1 @@
-export JAVA_HOME=/usr/lib/jvm/java-8-oracle
+export JAVA_HOME=/opt/jdk1.8.0_121/
diff --git a/pipelines/provision/neo4j/Jenkinsfile b/pipelines/provision/neo4j/Jenkinsfile
@@ -20,16 +20,6 @@ node() {
                 envDir = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-3].trim()
                 module = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-2].trim()
                 jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
-		dir('private'){
-                checkout scm: [$class: 'GitSCM', branches: [[name: private_repo_branch]], extensions: [[$class: 'GitLFSPull'], [$class: 'CloneOption', depth: 1, noTags: true, reference: '', shallow: true]], userRemoteConfigs: [[credentialsId: private_repo_credentials, url: private_repo_url]]]
-		}
-                fileExists = sh(returnStdout: true, script: "find ${currentWs} -name 'neo4j*.tar.gz'")
-                  if (fileExists != "")
-                      sh "cp private/artifacts/neo4j*.tar.gz ansible/artifacts"
-                  else {
-                      println(ANSI_BOLD + ANSI_RED + "Uh Oh! Unable to find neo4j*.tar.gz. Please place this file in your private repo under artifact directory" + ANSI_NORMAL)
-                      error 'Please resolve the errors and rerun..'
-_                 }
                 ansiblePlaybook = "${currentWs}/ansible/lp_learning_neo4j_provision.yml"
                 ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass"
                 values.put('currentWs', currentWs)
@@ -53,4 +43,4 @@ _                 }
         slack_notify(currentBuild.result)
         email_notify()
     }
-}
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export JAVA_HOME=/usr/lib/jvm/java-8-oracle
		export JAVA_HOME=/opt/jdk1.8.0_121/