فهرست منبع

moved ci-cd from ci-cd branch to master

Bulat Yusupov 5 سال پیش
والد
کامیت
2bcd7b0bfa
1فایلهای تغییر یافته به همراه4 افزوده شده و 3 حذف شده
  1. 4 3
      Jenkinsfile

+ 4 - 3
Jenkinsfile

@@ -55,12 +55,13 @@ spec:
     stages {
         stage('Checkout release branch') {
             steps {
+                git credentialsId: 'github-jenkins-internal-provectus', url: 'https://github.com/provectus/kafka-ui.git'
                 sh 'git checkout -b release'
             }
         }
         stage('Merge to release branch') {
             steps {
-                sh 'git merge origin/ci-cd'
+                sh 'git merge origin/master'
             }
         }
         stage('Remove SNAPSHOT from version') {
@@ -129,7 +130,7 @@ spec:
         }
         stage('Checkout master') {
             steps {
-                sh 'git checkout origin/ci-cd'
+                sh 'git checkout origin/master'
             }
         }
         stage('Increase version in master') {
@@ -145,7 +146,7 @@ spec:
                     withCredentials([usernamePassword(credentialsId: 'github-jenkins-internal-provectus', passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USER')]) {
                         sh "git add ."
                         sh "git -c user.name=\"$GIT_USER\" -c user.email=\"\" commit -m \"Increased version\""
-                        sh "git push https://$GIT_USER:$GIT_PASSWORD@github.com/provectus/kafka-ui.git HEAD:ci-cd"
+                        sh "git push https://$GIT_USER:$GIT_PASSWORD@github.com/provectus/kafka-ui.git HEAD:master"
                     }
                 }
             }