Bug 1841: LTS Support

Change stage 3 base image to Ubuntu 20.04 so we can use
python3.8

Change-Id: I42f9185277b9f081611c550cf0f86235b9bf8e85
Signed-off-by: beierlm <mark.beierl@canonical.com>

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index 5c2267c..d0a4fe1 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -117,7 +117,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
             def downstream_params_stage_3 = [
                 string(name: 'GERRIT_BRANCH', value: "${branch}"),
                 string(name: 'INSTALLER', value: "Default" ),
-                string(name: 'OPENSTACK_BASE_IMAGE', value: "ubuntu18.04" ),
+                string(name: 'OPENSTACK_BASE_IMAGE', value: "ubuntu20.04" ),
                 string(name: 'UPSTREAM_JOB_NAME', value: "${JOB_NAME}" ),
                 string(name: 'UPSTREAM_JOB_NUMBER', value: "${BUILD_NUMBER}" ),
                 booleanParam(name: 'DO_STAGE_4', value: do_stage_4 )

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 0dbeb7d..64a55cc 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -32,7 +32,7 @@ properties([
         string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'),
         string(defaultValue: 'osm-stage_4', description: '', name: 'DOWNSTREAM_STAGE_NAME'),
         string(defaultValue: 'testing-daily', description: '', name: 'DOCKER_TAG'),
-        string(defaultValue: 'ubuntu18.04', description: '', name: 'OPENSTACK_BASE_IMAGE'),
+        string(defaultValue: 'ubuntu20.04', description: '', name: 'OPENSTACK_BASE_IMAGE'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_FAIL'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS'),
         booleanParam(defaultValue: true, description: '', name: 'SAVE_ARTIFACTS_ON_SMOKE_SUCCESS'),
@@ -446,6 +446,11 @@ node("${params.NODE}") {
                     remote.logLevel = 'INFO'
                     remote.pty = true
 
+                    sshCommand remote: remote, command: """
+                        echo "Acquire::http::Proxy \\"$APT_PROXY\\";" | sudo tee /etc/apt/apt.conf.d/proxy.conf
+                        echo "Acquire::https::Proxy \\"$APT_PROXY\\";" | sudo tee -a /etc/apt/apt.conf.d/proxy.conf
+                        cat /etc/apt/apt.conf.d/proxy.conf
+                    """
                     // Force time sync to avoid clock drift and invalid certificates
                     sshCommand remote: remote, command: """
                         sudo apt update