From 2dce3f0aada02b4e625db5bb21b9e0d31b23e7e2 Mon Sep 17 00:00:00 2001 From: mfonville Date: Sat, 15 May 2021 19:50:29 +0200 Subject: [PATCH 01/11] Get rpm from bionic --- script/vsts/platforms/templates/preparation.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index 94ded473f..018a45d4e 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -4,7 +4,10 @@ steps: - script: | sudo apt-get update sudo apt-get install -y wget software-properties-common - sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev rpm libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev + sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-devlibx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common + # rpm needs to be at least 4.14, in xenial it is too old + sudo apt-add-repository -y ‘deb https://archive.ubuntu.com/ubuntu/ bionic main universe’ + sudo apt-get install -y rpm # clang 9 is included in the image clang -v displayName: Install apt dependencies From 0711623b2d41e2260a23524c4b83e97cc8b9ed46 Mon Sep 17 00:00:00 2001 From: mfonville Date: Sat, 15 May 2021 19:55:05 +0200 Subject: [PATCH 02/11] Use azure mirror repository --- script/vsts/platforms/templates/preparation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index 018a45d4e..6124f816f 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -6,7 +6,7 @@ steps: sudo apt-get install -y wget software-properties-common sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-devlibx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common # rpm needs to be at least 4.14, in xenial it is too old - sudo apt-add-repository -y ‘deb https://archive.ubuntu.com/ubuntu/ bionic main universe’ + sudo apt-add-repository -y ‘deb https://azure.archive.ubuntu.com/ubuntu/ bionic main universe’ sudo apt-get install -y rpm # clang 9 is included in the image clang -v From daaf4378bf9e1faae747b24faf3adf224cbb8057 Mon Sep 17 00:00:00 2001 From: mfonville Date: Sat, 15 May 2021 19:57:10 +0200 Subject: [PATCH 03/11] small fixes --- script/vsts/platforms/templates/preparation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index 6124f816f..143da2fc3 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -4,9 +4,10 @@ steps: - script: | sudo apt-get update sudo apt-get install -y wget software-properties-common - sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-devlibx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common + sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common # rpm needs to be at least 4.14, in xenial it is too old sudo apt-add-repository -y ‘deb https://azure.archive.ubuntu.com/ubuntu/ bionic main universe’ + sudo apt update sudo apt-get install -y rpm # clang 9 is included in the image clang -v From 7f22c983d3e358e31bd8a045a6a71ac3c923de8e Mon Sep 17 00:00:00 2001 From: mfonville Date: Sat, 15 May 2021 20:06:09 +0200 Subject: [PATCH 04/11] had wrong type of quotes --- script/vsts/platforms/templates/preparation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index 143da2fc3..9cc02dd0b 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -6,7 +6,7 @@ steps: sudo apt-get install -y wget software-properties-common sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common # rpm needs to be at least 4.14, in xenial it is too old - sudo apt-add-repository -y ‘deb https://azure.archive.ubuntu.com/ubuntu/ bionic main universe’ + sudo apt-add-repository -y 'deb https://azure.archive.ubuntu.com/ubuntu/ bionic main universe' sudo apt update sudo apt-get install -y rpm # clang 9 is included in the image From 94074a8e91d48812691b79d13120b521c14b9605 Mon Sep 17 00:00:00 2001 From: mfonville Date: Sat, 15 May 2021 20:19:52 +0200 Subject: [PATCH 05/11] Azure only has http and no https --- script/vsts/platforms/templates/preparation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index 9cc02dd0b..d99e27bba 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -6,7 +6,7 @@ steps: sudo apt-get install -y wget software-properties-common sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common # rpm needs to be at least 4.14, in xenial it is too old - sudo apt-add-repository -y 'deb https://azure.archive.ubuntu.com/ubuntu/ bionic main universe' + sudo apt-add-repository -y 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main universe' sudo apt update sudo apt-get install -y rpm # clang 9 is included in the image From c232b19195aa9b4c5f25f59d90326d88eda66b48 Mon Sep 17 00:00:00 2001 From: mfonville Date: Sat, 15 May 2021 20:46:34 +0200 Subject: [PATCH 06/11] apt-get is preferred in scripts --- script/vsts/platforms/templates/preparation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index d99e27bba..7d78d31a6 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -7,7 +7,7 @@ steps: sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common # rpm needs to be at least 4.14, in xenial it is too old sudo apt-add-repository -y 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main universe' - sudo apt update + sudo apt-get update sudo apt-get install -y rpm # clang 9 is included in the image clang -v From 6a723d431449a12200f566f8aa557475f3871458 Mon Sep 17 00:00:00 2001 From: mfonville Date: Sat, 15 May 2021 23:00:08 +0200 Subject: [PATCH 07/11] merge the two apt-get statements --- script/vsts/platforms/templates/preparation.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index 7d78d31a6..a9022171b 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -3,8 +3,7 @@ steps: # Linux Specific - script: | sudo apt-get update - sudo apt-get install -y wget software-properties-common - sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common + sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common wget # rpm needs to be at least 4.14, in xenial it is too old sudo apt-add-repository -y 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main universe' sudo apt-get update From 74e57e71dea590f8377f498680a0b4da9e9b1079 Mon Sep 17 00:00:00 2001 From: mfonville Date: Sat, 15 May 2021 23:41:36 +0200 Subject: [PATCH 08/11] Also add bionic security repo, some of the rpm dependencies got a security update --- script/vsts/platforms/templates/preparation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index a9022171b..125d69911 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -6,6 +6,7 @@ steps: sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common wget # rpm needs to be at least 4.14, in xenial it is too old sudo apt-add-repository -y 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main universe' + sudo apt-add-repository -y 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic-security main universe' sudo apt-get update sudo apt-get install -y rpm # clang 9 is included in the image From 78cba2a6e84228f3869649359a9a92331010686b Mon Sep 17 00:00:00 2001 From: mfonville Date: Sat, 15 May 2021 23:49:39 +0200 Subject: [PATCH 09/11] Use Ubuntu Extended Security Maintenance mirror instead of Azure for security --- script/vsts/platforms/templates/preparation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index 125d69911..690536914 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -6,7 +6,7 @@ steps: sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common wget # rpm needs to be at least 4.14, in xenial it is too old sudo apt-add-repository -y 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main universe' - sudo apt-add-repository -y 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic-security main universe' + sudo apt-add-repository -y 'deb https://esm.ubuntu.com/infra/ubuntu bionic-infra-security main universe' sudo apt-get update sudo apt-get install -y rpm # clang 9 is included in the image From a80522639355ee54c0cd2a4a5d97092edfb6cc7f Mon Sep 17 00:00:00 2001 From: mfonville Date: Sat, 15 May 2021 23:54:39 +0200 Subject: [PATCH 10/11] Revert "Use Ubuntu Extended Security Maintenance mirror instead of Azure for security" This reverts commit 78cba2a6e84228f3869649359a9a92331010686b. --- script/vsts/platforms/templates/preparation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index 690536914..125d69911 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -6,7 +6,7 @@ steps: sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common wget # rpm needs to be at least 4.14, in xenial it is too old sudo apt-add-repository -y 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main universe' - sudo apt-add-repository -y 'deb https://esm.ubuntu.com/infra/ubuntu bionic-infra-security main universe' + sudo apt-add-repository -y 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic-security main universe' sudo apt-get update sudo apt-get install -y rpm # clang 9 is included in the image From 0d05713957eabb10b6c21c996b2f744c4a2cf6bb Mon Sep 17 00:00:00 2001 From: mfonville Date: Sun, 16 May 2021 07:35:06 +0200 Subject: [PATCH 11/11] fix typo --- script/vsts/platforms/templates/preparation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index 125d69911..2314ed31b 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -4,7 +4,7 @@ steps: - script: | sudo apt-get update sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgtk-3-0 libasound2 libicu-dev software-properties-common wget - # rpm needs to be at least 4.14, in xenial it is too old + # rpm needs to be at least 4.13, in xenial it is too old sudo apt-add-repository -y 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main universe' sudo apt-add-repository -y 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic-security main universe' sudo apt-get update