updates for organization of RPMs in artifactory by release version

Author: phalseth-hpe

Jenkinsfile.github

@@ -11,11 +11,12 @@ pipeline {
     }
 
     environment {
-        IS_STABLE = getBuildIsStable()
+        IS_STABLE = getBuildIsStable(releaseBranchIsStable: true)
         BUILD_METADATA = getRpmRevision(isStable: env.IS_STABLE)
         GIT_REPO_NAME = getRepoName()
-     }
-
+        RELEASE_BRANCH_VERSION = getReleaseBranchVersion()
+    }
+    
     stages {
         stage("Prepare") {
             steps {
@@ -41,10 +42,16 @@ pipeline {
       stage('Publish') {
           steps {
             script {
-              publishCsmRpms(component: env.GIT_REPO_NAME, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", arch: "noarch", isStable: env.IS_STABLE)
-              publishCsmRpms(component: env.GIT_REPO_NAME, pattern: "dist/rpmbuild/SRPMS/*.rpm", arch: "src", isStable: env.IS_STABLE)
+                if(env.RELEASE_BRANCH_VERSION){
+                    RELEASE_FOLDER = "/" + env.RELEASE_BRANCH_VERSION 
+                } else {
+                    RELEASE_FOLDER = ""
+                }
+                publishCsmRpms(component: env.GIT_REPO_NAME + RELEASE_FOLDER, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", arch: "noarch", isStable: env.IS_STABLE)
+                publishCsmRpms(component: env.GIT_REPO_NAME + RELEASE_FOLDER, pattern: "dist/rpmbuild/SRPMS/*.rpm", arch: "src", isStable: env.IS_STABLE)
+            }
         }
       }
     }
   }
-}
+