Merge branch 'devops-2696' into 'master'

devops-2696 remove branch from values path

See merge request greensight/ensi/catalog/pim!314

Jenkinsfile

@@ -139,15 +139,12 @@ node('docker-agent'){
                         "ms-helm-values/${options.get("COMMON_VALUES_PATH")}/common-env.sops.yaml",
                     ])
 
-                    def branchFolder = "ms-helm-values/${options.get("VALUES_PATH")}/${env.BRANCH_NAME}/${options.get("HELM_RELEASE")}"
-                    def masterFolder = "ms-helm-values/${options.get("VALUES_PATH")}/master/${options.get("HELM_RELEASE")}"
+                    def valuesFolder = "ms-helm-values/${options.get("VALUES_PATH")}/${options.get("HELM_RELEASE")}"
                     helm.addFirstExisting([
-                        "${branchFolder}/${options.get("HELM_RELEASE")}.yaml",
-                        "${masterFolder}/${options.get("HELM_RELEASE")}.yaml"
+                        "${valuesFolder}/${options.get("HELM_RELEASE")}.yaml"
                     ])
                     helm.addFirstExistingOptional([
-                        "${branchFolder}/${options.get("HELM_RELEASE")}.sops.yaml",
-                        "${masterFolder}/${options.get("HELM_RELEASE")}.sops.yaml"
+                        "${valuesFolder}/${options.get("HELM_RELEASE")}.sops.yaml"
                     ])
                 }
                 dir('src') {