From 92c43b00cef1bb8135d91618a49dd0494e0b2e65 Mon Sep 17 00:00:00 2001 From: Alexander Noskov Date: Mon, 17 Jun 2019 05:49:56 +0000 Subject: [PATCH] Use exact Ubuntu Xenial release. By specifying exact ubuntu release as a tag for `updater.py` script, it prevents downloading ubuntu with a higher release, for example, ubuntu bionic. Changing bionic to xenial for armada chart. Change-Id: I1864c3f8db2d90ab63d7d923de8f2ac0ecd20e31 --- site/airskiff/software/charts/ucp/armada/armada.yaml | 2 +- tools/gate/Jenkinsfile | 2 +- tools/gate/airsloop/Jenkinsfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site/airskiff/software/charts/ucp/armada/armada.yaml b/site/airskiff/software/charts/ucp/armada/armada.yaml index c610b2f2b..79dec1277 100644 --- a/site/airskiff/software/charts/ucp/armada/armada.yaml +++ b/site/airskiff/software/charts/ucp/armada/armada.yaml @@ -25,7 +25,7 @@ data: values: images: tags: - api: quay.io/airshipit/armada:latest-ubuntu_bionic + api: quay.io/airshipit/armada:latest-ubuntu_xenial pod: replicas: api: 1 diff --git a/tools/gate/Jenkinsfile b/tools/gate/Jenkinsfile index 8a8869f2f..d0e17d05c 100644 --- a/tools/gate/Jenkinsfile +++ b/tools/gate/Jenkinsfile @@ -239,7 +239,7 @@ def uplift_versions = { stage('Uplift Versions') { sh 'sudo apt-get install python3-yaml python3-git -y' - def cmd = 'tools/updater.py --in-file global/software/config/versions.yaml --tag-filter ubuntu' + def cmd = 'tools/updater.py --in-file global/software/config/versions.yaml --tag-filter ubuntu_xenial' if (!UPLIFT_BLACKLIST.isEmpty()) { cmd += " --skip ${UPLIFT_BLACKLIST}" diff --git a/tools/gate/airsloop/Jenkinsfile b/tools/gate/airsloop/Jenkinsfile index 120f90a23..6e80870a6 100644 --- a/tools/gate/airsloop/Jenkinsfile +++ b/tools/gate/airsloop/Jenkinsfile @@ -234,7 +234,7 @@ def uplift_versions = { stage('Uplift Versions') { sh 'sudo apt-get install python3-yaml python3-git -y' - def cmd = 'tools/updater.py --in-file global/software/config/versions.yaml --tag-filter ubuntu' + def cmd = 'tools/updater.py --in-file global/software/config/versions.yaml --tag-filter ubuntu_xenial' if (!UPLIFT_BLACKLIST.isEmpty()) { cmd += " --skip ${UPLIFT_BLACKLIST}"