Merge remote-tracking branch 'origin/master' into develop

Author: artbear

Jenkinsfile

@@ -23,13 +23,18 @@ pipeline {
                     }
                     else
                         echo 'no testing task'
+                        
+                    def scannerHome = tool 'sonar-scanner';
+                    withSonarQubeEnv('silverbulleters') {
+                        sh "${scannerHome}/bin/sonar-scanner"
+                    }
                 }
 
             }
 
         }
 
-        stage('Тестирование кода пакета LINUX') {
+/*        stage('Тестирование кода пакета LINUX') {
 
             agent { label 'master' }
 
@@ -38,57 +43,7 @@ pipeline {
             }
 
         }
+*/
 
-        stage('Сборка пакета') {
-
-            agent { label 'windows' }
-
-            steps {
-                checkout scm
-
-                bat 'erase /Q *.ospx'
-                bat 'chcp 65001 > nul && call opm build .'
-
-                stash includes: '*.ospx', name: 'package'
-                archiveArtifacts '*.ospx'
-            }
-
-        }
-        
-        stage('Публикация в хабе') {
-            when {
-                branch 'master'
-            }
-            agent { label 'master' }
-            steps {
-                sh 'rm -f *.ospx'
-                unstash 'package'
-
-                sh '''
-                artifact=`ls -1 *.ospx`
-                basename=`echo $artifact | sed -r 's/(.+)-.*(.ospx)/\\1/'`
-                cp $artifact $basename.ospx
-                sudo rsync -rv *.ospx /var/www/hub.oscript.io/download/$basename/
-                '''.stripIndent()
-            }
-        }
-
-        stage('Публикация в нестабильном хабе') {
-            when {
-                branch 'develop'
-            }
-            agent { label 'master' }
-            steps {
-                sh 'rm -f *.ospx'
-                unstash 'package'
-
-                sh '''
-                artifact=`ls -1 *.ospx`
-                basename=`echo $artifact | sed -r 's/(.+)-.*(.ospx)/\\1/'`
-                cp $artifact $basename.ospx
-                sudo rsync -rv *.ospx /var/www/hub.oscript.io/dev-channel/$basename/
-                '''.stripIndent()
-            }
-        }
     }
 }