From dff921039d7ce0dc35bd5f54b661457f91c84274 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Tue, 26 Jan 2021 16:20:04 -0300 Subject: [PATCH 1/3] upstream CI: update Azure vmImage to 'ubuntu-20.04'. In the near future, Github will use Ubuntu 20.04, for workflows, and this change will keep the upstream CI environment consistent between Github and Azure. --- tests/azure/azure-pipelines.yml | 2 +- tests/azure/build-containers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/azure/azure-pipelines.yml b/tests/azure/azure-pipelines.yml index d8914d96..997066bd 100644 --- a/tests/azure/azure-pipelines.yml +++ b/tests/azure/azure-pipelines.yml @@ -15,7 +15,7 @@ trigger: - master pool: - vmImage: 'ubuntu-18.04' + vmImage: 'ubuntu-20.04' stages: - stage: Centos7 diff --git a/tests/azure/build-containers.yml b/tests/azure/build-containers.yml index 628d20b9..5dc3fbfc 100644 --- a/tests/azure/build-containers.yml +++ b/tests/azure/build-containers.yml @@ -11,7 +11,7 @@ schedules: trigger: none pool: - vmImage: 'ubuntu-18.04' + vmImage: 'ubuntu-20.04' jobs: From 141554bd3da78b62dbeeeec3116a9751ba8f0a6e Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Tue, 26 Jan 2021 16:21:46 -0300 Subject: [PATCH 2/3] upstream CI: Explicitly install Ansible. Without explicit installation, Ansible was failing to run on Azure pipelines. This change explicitly install the latest Ansible version available through `pip`. --- tests/azure/templates/build_container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/azure/templates/build_container.yml b/tests/azure/templates/build_container.yml index 8649a336..0bd49321 100644 --- a/tests/azure/templates/build_container.yml +++ b/tests/azure/templates/build_container.yml @@ -15,7 +15,7 @@ jobs: inputs: versionSpec: '3.6' - - script: python -m pip install --upgrade pip setuptools wheel + - script: python -m pip install --upgrade pip setuptools wheel ansible displayName: Install tools - script: pip install molecule[docker] From 90779ed7ab362d0057592e82f680594f5a637c23 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Tue, 26 Jan 2021 16:24:01 -0300 Subject: [PATCH 3/3] upstream CI: change name of base image for CentOS and Fedora. Building containers for CentOS and Fedora were failing due to image download failure. The container build process was fixed by changing the base images. --- molecule/centos-8-build/molecule.yml | 2 +- molecule/fedora-latest-build/molecule.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/molecule/centos-8-build/molecule.yml b/molecule/centos-8-build/molecule.yml index e19fe11a..ec3ef20d 100644 --- a/molecule/centos-8-build/molecule.yml +++ b/molecule/centos-8-build/molecule.yml @@ -3,7 +3,7 @@ driver: name: docker platforms: - name: centos-8-build - image: centos:8 + image: "centos:centos8" pre_build_image: true hostname: ipaserver.test.local dns_servers: diff --git a/molecule/fedora-latest-build/molecule.yml b/molecule/fedora-latest-build/molecule.yml index 624d99f2..4c6c2fcc 100644 --- a/molecule/fedora-latest-build/molecule.yml +++ b/molecule/fedora-latest-build/molecule.yml @@ -3,7 +3,7 @@ driver: name: docker platforms: - name: fedora-latest-build - image: fedora-latest + image: "fedora:latest" dockerfile: Dockerfile hostname: ipaserver.test.local dns_servers: