-v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:${tagName} \
-c -t ${testName}""")
} finally {
- sh("cp ${tempdir}/* .")
+ sh("cp ${tempdir}/*.xml .")
+ sh("cp ${tempdir}/*.html .")
outputDirectory = sh(returnStdout: true, script: 'pwd').trim()
println("Present Directory is : ${outputDirectory}")
step([
///////////////////////////////////////////////////////////////////////////////////////
stage('Copy Artifacts') {
// cleanup any previous repo
- sh 'rm -rf repo'
+ sh "tree -fD repo || exit 0"
+ sh 'rm -rvf repo'
+ sh "tree -fD repo && lsof repo || exit 0"
dir('repo') {
packageList = []
dir("${RELEASE}") {
parallelSteps = [:]
list = ['RO', 'osmclient', 'IM', 'devops', 'MON', 'N2VC', 'NBI',
- 'common', 'LCM', 'POL', 'NG-UI', 'PLA', 'tests']
+ 'common', 'LCM', 'POL', 'NG-UI', 'NG-SA', 'PLA', 'tests']
if (upstreamComponent.length() > 0) {
println("Skipping upstream fetch of ${upstreamComponent}")
list.remove(upstreamComponent)
ci_helper.check_status_http_server(NODE_IP_ADDRESS, repo_port)
}
+ sh "tree -fD repo"
+
// Unpack devops package into temporary location so that we use it from upstream if it was part of a patch
osm_devops_dpkg = sh(returnStdout: true, script: 'find ./repo/release/pool/ -name osm-devops*.deb').trim()
devopstempdir = sh(returnStdout: true, script: 'mktemp -d').trim()
pty: true
]
- // Force loading of the ETSI Debian Package Signing Key
- sshCommand remote: remote, command: 'sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93EC7342B1168CDB'
+ // Ensure the VM is ready
+ sshCommand remote: remote, command: 'cloud-init status --wait'
// Force time sync to avoid clock drift and invalid certificates
sshCommand remote: remote, command: 'sudo apt-get update'
sshCommand remote: remote, command: 'sudo apt-get install -y chrony'
]
sshCommand remote: remote, command: '''
- wget https://osm-download.etsi.org/ftp/osm-11.0-eleven/install_osm.sh
+ wget https://osm-download.etsi.org/ftp/osm-13.0-thirteen/install_osm.sh
chmod +x ./install_osm.sh
sed -i '1 i\\export PATH=/snap/bin:\$PATH' ~/.bashrc
'''
parallelSteps[module] = {
dir("$module") {
+ sh("docker pull ${INTERNAL_DOCKER_REGISTRY}opensourcemano/${moduleName}:${moduleTag}")
sh("""docker tag opensourcemano/${moduleName}:${moduleTag} \
opensourcemano/${moduleName}:${dockerTag}""")
sh "docker push opensourcemano/${moduleName}:${dockerTag}"
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==\"latest/edge/merged\")| .version'"
- jqScriptBeta = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"latest/beta\")| .version'"
+ 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==\"latest/edge/merged\")| .version'"
- jqScriptBeta = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[].releases[] | select(.channel==\"latest/beta\")| .version'"
+ 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"
}
- println(jqScriptEdge)
- println(jqScriptBeta)
// 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"
+ 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} --channel=${channel}/beta"
+ sh "charmcraft release ${charm} --revision=${edge_rev} ${resourceArgument} --channel=${channel}/beta"
}
}