Merge pull request #778 from MasterAlt/release-2.4.0

Offline installer for sunbird with 32 bit, 64 bit and debian installer with a dropdown in jenkins

ansible/roles/offline-installer/templates/setupOfflineInstaller.sh.j2

@@ -8,13 +8,20 @@ n 8.16
 cd src
 npm install
 npm run dist
-npm run dist-win64
-npm run dist-linux
-# npm run dist-win32  ## For win 32 bit installation
-# Copy the build artifacts to specific folder
-#cp src/dist/DIKSHA\ Setup\ 1.0.0.exe offline_artifacts/{{build_number}}/
-#cp src/dist/DIKSHA_1.0.0_amd64.deb offline_artifacts/{{build_number}}/
 
-cp 'dist/1.0.0/win/x64/DIKSHA Setup 1.0.0.exe' ../offline_artifacts/{{build_number}}/
-cp dist/1.0.0/linux/x64/DIKSHA_1.0.0_amd64.deb ../offline_artifacts/{{build_number}}/
-#cp 'src/dist/1.0.0/win/x32/DIKSHA Setup 1.0.0.exe' 'offline_artifacts/{{build_number}}//DIKSHA Setup 1.0.0.32.exe'
+if [ "{{offline_installer_type}}" == "windows32" ];
+then
+	npm run dist-win32
+        ls -lR
+	cp 'dist/1.0.0/win/ia32/DIKSHA Setup 1.0.0.exe' ../offline_artifacts/{{build_number}}/
+elif [ "{{offline_installer_type}}" == "windows64" ];
+then
+	npm run dist-win64
+        ls -lR
+        cp 'dist/1.0.0/win/x64/DIKSHA Setup 1.0.0.exe' ../offline_artifacts/{{build_number}}/
+elif [ "{{offline_installer_type}}" == "debian" ];
+then
+	npm run dist-linux
+        ls -lR
+        cp dist/1.0.0/linux/x64/DIKSHA_1.0.0_amd64.deb ../offline_artifacts/{{build_number}}/
+fi

pipelines/offlineinstaller/Jenkinsfile

@@ -23,7 +23,7 @@ node() {
                     stage('Pre requisites for installer') {
 			values = [:]
                     	ansiblePlaybook = "${currentWs}/ansible/offline-installer.yml --vault-password-file /var/lib/jenkins/secrets/vault-pass "
-		    	ansibleExtraArgs = " --extra-vars \"offline_repo_location=$currentWs build_number=$BUILD_NUMBER\" -vv"
+		    	ansibleExtraArgs = " --extra-vars \"offline_repo_location=$currentWs build_number=$BUILD_NUMBER offline_installer_type=${offline_installer_type}\" -vv"
 		        values.put('currentWs', currentWs)
 		        values.put('env', envDir)
                 	values.put('module', module)
@@ -34,7 +34,7 @@ node() {
                     	ansible_playbook_run(values)
                 }
 		try {
-		     stage('Build, create and upload installer to azure') {
+		     stage('Build Installer, create and upload it to azure') {
 			dir('offline-installer-repo') {
 				sh """
 					bash -x build.sh
@@ -42,7 +42,7 @@ node() {
 			}
 			values = [:]
                         ansiblePlaybook = "${currentWs}/ansible/offline-installer.yml --vault-password-file /var/lib/jenkins/secrets/vault-pass "
-                        ansibleExtraArgs = " --extra-vars \"offline_repo_location=$currentWs build_number=$BUILD_NUMBER uploadInstaller=True \""
+                        ansibleExtraArgs = " --extra-vars \"offline_repo_location=$currentWs build_number=$BUILD_NUMBER uploadInstaller=True offline_installer_type=${offline_installer_type}\""
                         values.put('currentWs', currentWs)
                         values.put('env', envDir)
                         values.put('module', module)
@@ -56,7 +56,7 @@ node() {
 		catch (err) {
 			values = [:]
                         ansiblePlaybook = "${currentWs}/ansible/offline-installer.yml --vault-password-file /var/lib/jenkins/secrets/vault-pass "
-                        ansibleExtraArgs = " --extra-vars \"offline_repo_location=$currentWs removeOfflineInstallerFolder=True build_number=$BUILD_NUMBER\""
+                        ansibleExtraArgs = " --extra-vars \"offline_repo_location=$currentWs removeOfflineInstallerFolder=True build_number=$BUILD_NUMBER offline_installer_type=${offline_installer_type}\""
                         values.put('currentWs', currentWs)
                         values.put('env', envDir)
                         values.put('module', module)