X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=92a3dcfd0014d314772d8649e787791253ac996c;hb=2ce240ca49553ed9d59f6d03b5d3a4592ffa353c;hp=90cd9f7b0166a4f64185bc98cac3aad59f05ce3b;hpb=8375da1695c98bd23fcc226f0e26c20ac5710d1b;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 90cd9f7b..92a3dcfd 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -68,6 +68,7 @@ void run_robot_systest(String tagName, String osmHostname, String prometheusHostname, Integer prometheusPort=null, + String ociRegistryUrl, String envfile=null, String portmappingfile=null, String kubeconfig=null, @@ -100,12 +101,17 @@ void run_robot_systest(String tagName, } try { - sh("""docker run --env OSM_HOSTNAME=${osmHostname} --env PROMETHEUS_HOSTNAME=${prometheusHostname} \ - ${PROMETHEUS_PORT_VAR} ${JUJU_PASSWORD_VAR} --env-file ${environmentFile} \ - -v ${clouds}:/etc/openstack/clouds.yaml \ - -v ${osmRSAfile}:/root/osm_id_rsa -v ${kubeconfig}:/root/.kube/config -v ${tempdir}:/robot-systest/reports \ - -v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:${tagName} \ - -c -t ${testName}""") + withCredentials([usernamePassword(credentialsId: 'gitlab-oci-test', + passwordVariable: 'OCI_REGISTRY_PSW', usernameVariable: 'OCI_REGISTRY_USR')]) { + sh("""docker run --env OSM_HOSTNAME=${osmHostname} --env PROMETHEUS_HOSTNAME=${prometheusHostname} \ + ${PROMETHEUS_PORT_VAR} ${JUJU_PASSWORD_VAR} --env-file ${environmentFile} \ + --env OCI_REGISTRY_URL=${ociRegistryUrl} --env OCI_REGISTRY_USER=${OCI_REGISTRY_USR} \ + --env OCI_REGISTRY_PASSWORD=${OCI_REGISTRY_PSW} \ + -v ${clouds}:/etc/openstack/clouds.yaml -v ${osmRSAfile}:/root/osm_id_rsa \ + -v ${kubeconfig}:/root/.kube/config -v ${tempdir}:/robot-systest/reports \ + -v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:${tagName} \ + -c -t ${testName}""") + } } finally { sh("cp ${tempdir}/*.xml .") sh("cp ${tempdir}/*.html .") @@ -185,6 +191,7 @@ node("${params.NODE}") { APT_PROXY = 'http://172.21.1.1:3142' SSH_KEY = '~/hive/cicd_rsa' ARCHIVE_LOGS_FLAG = false + OCI_REGISTRY_URL = 'oci://osm.etsi.org:5050/devops/test' sh 'env' tag_or_branch = params.GERRIT_BRANCH.replaceAll(/\./, '') @@ -634,6 +641,7 @@ EOF""" osmHostname, prometheusHostname, prometheusPort, + OCI_REGISTRY_URL, params.ROBOT_VIM, params.ROBOT_PORT_MAPPING_VIM, params.KUBECONFIG, @@ -685,104 +693,6 @@ EOF""" } parallel parallelSteps } - stage('Snap promotion') { - withCredentials([string(credentialsId: 'Snapstore', variable: 'SNAPCRAFT_STORE_CREDENTIALS')]) { - snaps = ['osmclient'] - for (snap in snaps) { - channel = 'latest/' - if (BRANCH_NAME.startsWith('v')) { - channel = BRANCH_NAME.substring(1) + '/' - } else if (BRANCH_NAME != 'master') { - channel += '/' + BRANCH_NAME.replaceAll('/', '-') - } - track = channel + 'edge\\*' - edge_rev = sh(returnStdout: true, - script: "snapcraft revisions $snap | " + - "grep \"$track\" | tail -1 | awk '{print \$1}'").trim() - track = channel + 'beta\\*' - beta_rev = sh(returnStdout: true, - script: "snapcraft revisions $snap | " + - "grep \"$track\" | tail -1 | awk '{print \$1}'").trim() - - print "Edge: $edge_rev, Beta: $beta_rev" - - if (edge_rev != beta_rev) { - print "Promoting $edge_rev to beta in place of $beta_rev" - beta_track = channel + 'beta' - sh "snapcraft release $snap $edge_rev $beta_track" - } - } - } - } // stage('Snap promotion') - stage('Charm promotion') { - charms = [ - [name: 'osm', base: "22.04"], - [name: 'osm-ha', base: "22.04"], - [name: 'mongodb-exporter-k8s', base: "20.04"], - [name: 'mysqld-exporter-k8s', base: "20.04"], - [name: 'osm-grafana', base: "20.04"], - [name: 'osm-keystone', base: "22.04"], - [name: 'osm-lcm', base: "22.04"], - [name: 'osm-mon', base: "22.04"], - [name: 'osm-nbi', base: "22.04"], - [name: 'osm-ng-ui', base: "22.04"], - [name: 'osm-pol', base: "22.04"], - [name: 'osm-ro', base: "22.04"], - [name: 'osm-prometheus', base: "20.04"], - [name: 'osm-update-db-operator', base: "20.04"], - [name: 'osm-vca-integrator', base: "22.04"], - ] - for (entry in charms) { - charm = entry.name - base = entry.base - 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 2>/dev/null").trim() as int - resourceArgument = "" - if (isCharm) { - jqScriptEdge = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"$base\") | .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==\"$base\") | .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==\"$base\") | .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==\"$base\") | .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)