X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;fp=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=006509294f2e4e8e78c0c92bc1c40c9ed72771c6;hb=366ed71248f46f8a3754cb5189e39b9ea53a22b7;hp=fb5120df836e99cd58308d8bf7178752dadc04d3;hpb=37a7ee5c717a44113ecd0d0eec4bf4857b0494f4;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index fb5120df..00650929 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -675,73 +675,6 @@ EOF"""
                                 }
                             }
                         } // stage('Snap promotion')
-                        stage('Charm promotion') {
-                            charms = [
-                                'osm', // bundle
-                                'osm-ha', // bundle
-                                'osm-grafana',
-                                'osm-mariadb',
-                                'mongodb-exporter-k8s',
-                                'mysqld-exporter-k8s',
-                                'osm-lcm',
-                                'osm-mon',
-                                'osm-nbi',
-                                'osm-ng-ui',
-                                'osm-pol',
-                                'osm-ro',
-                                'osm-prometheus',
-                                'osm-vca-integrator',
-                            ]
-                            for (charm in charms) {
-
-                                channel = 'latest'
-                                if (BRANCH_NAME.startsWith('v')) {
-                                    channel = BRANCH_NAME.substring(1)
-                                } else if (BRANCH_NAME != 'master') {
-                                    channel += '/' + BRANCH_NAME.replaceAll('/', '-')
-                                }
-
-                                withCredentials([string(credentialsId: 'Charmstore', variable: 'CHARMCRAFT_AUTH')]) {
-                                    sh "charmcraft status $charm --format json > ${charm}.json"
-                                    isCharm = sh(returnStdout: true, script: "grep architecture ${charm}.json | wc -l").trim() as int
-                                    resourceArgument = ""
-                                    if (isCharm) {
-                                        jqScriptEdge = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"$channel/edge/merged\")| .version'|head -1"
-                                        jqScriptBeta = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"$channel/beta\")| .version'|head -1"
-                                        index=0
-                                        while (index < 5) {
-                                            resourceNameScript = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"$channel/edge/merged\")| .resources[$index].name'|head -1"
-                                            resourceRevsScript = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"$channel/edge/merged\")| .resources[$index].revision'|head -1"
-                                            resourceName = sh(returnStdout: true, script: resourceNameScript).trim()
-                                            resourceRevs = sh(returnStdout: true, script: resourceRevsScript).trim()
-                                            if (resourceName != "null") {
-                                                resourceArgument += " --resource ${resourceName}:${resourceRevs}"
-                                            } else {
-                                                break
-                                            }
-                                            index ++
-                                        }
-                                    } else {
-                                        jqScriptEdge = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[].releases[] | select(.channel==\"$channel/edge/merged\")| .version'|head -1"
-                                        jqScriptBeta = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[].releases[] | select(.channel==\"$channel/beta\")| .version'|head -1"
-                                    }
-                                    // edge/merged is used in place of /edge as 10.1.0 LTS uses latest/edge
-                                    edge_rev = sh(returnStdout: true, script: jqScriptEdge).trim()
-                                    beta_rev = sh(returnStdout: true, script: jqScriptBeta).trim()
-                                    try { edge_rev = edge_rev as int } catch (NumberFormatException nfe) {edge_rev = 0}
-                                    try { beta_rev = beta_rev as int } catch (NumberFormatException nfe) {beta_rev = 0}
-
-                                    print "Edge: $edge_rev, Beta: $beta_rev $resourceArgument"
-
-                                    if (edge_rev > beta_rev) {
-                                        print "Promoting $edge_rev to beta in place of $beta_rev"
-                                        beta_track = channel + 'beta'
-                                        sh "charmcraft release ${charm} --revision=${edge_rev}  ${resourceArgument} --channel=${channel}/beta"
-                                    }
-
-                                }
-                            }
-                        } // stage('Charm promotion')
                     } // if (params.DO_DOCKERPUSH)
                 } // stage('Archive')
             } // if (params.SAVE_ARTIFACTS_OVERRIDE || stage_archive)