From 52161549f74368ba049cf4b2b70949ab9a373328 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Tue, 6 Aug 2024 16:06:41 -0700 Subject: [PATCH] Update azure-pipelines files #520 Signed-off-by: Jono Yang --- azure-pipelines.yml | 68 ++++++++++-------------------------------- etc/ci/azure-posix.yml | 9 ++++-- 2 files changed, 22 insertions(+), 55 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c2a3b522..55430a9c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,68 +5,32 @@ # These jobs are using VMs with Azure-provided Python builds ################################################################################ +resources: + containers: + - container: postgres + image: postgres + env: + POSTGRES_DB: packagedb + POSTGRES_USER: packagedb + POSTGRES_PASSWORD: packagedb + POSTGRES_INITDB_ARGS: "--encoding=UTF-8 --lc-collate=en_US.UTF-8 --lc-ctype=en_US.UTF-8" + ports: + - 5432:5432 + jobs: - template: etc/ci/azure-posix.yml parameters: job_name: ubuntu20_cpython image_name: ubuntu-20.04 - python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python_versions: ['3.10', '3.11', '3.12'] test_suites: - all: venv/bin/pytest -n 2 -vvs + all: make test - template: etc/ci/azure-posix.yml parameters: job_name: ubuntu22_cpython image_name: ubuntu-22.04 - python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12'] - test_suites: - all: venv/bin/pytest -n 2 -vvs - - - template: etc/ci/azure-posix.yml - parameters: - job_name: macos12_cpython - image_name: macOS-12 - python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12'] - test_suites: - all: venv/bin/pytest -n 2 -vvs - - - template: etc/ci/azure-posix.yml - parameters: - job_name: macos13_cpython - image_name: macOS-13 - python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12'] - test_suites: - all: venv/bin/pytest -n 2 -vvs - - - template: etc/ci/azure-posix.yml - parameters: - job_name: macos14_cpython_arm64 - image_name: macOS-14 - python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12'] - test_suites: - all: venv/bin/pytest -n 2 -vvs - - - template: etc/ci/azure-posix.yml - parameters: - job_name: macos14_cpython - image_name: macOS-14-large - python_versions: ['3.8', '3.8', '3.9', '3.10', '3.12'] - test_suites: - all: venv/bin/pytest -n 2 -vvs - - - template: etc/ci/azure-win.yml - parameters: - job_name: win2019_cpython - image_name: windows-2019 - python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12'] - test_suites: - all: venv\Scripts\pytest -n 2 -vvs - - - template: etc/ci/azure-win.yml - parameters: - job_name: win2022_cpython - image_name: windows-2022 - python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python_versions: ['3.10', '3.11', '3.12'] test_suites: - all: venv\Scripts\pytest -n 2 -vvs + all: make test diff --git a/etc/ci/azure-posix.yml b/etc/ci/azure-posix.yml index 9fdc7f15..5357384f 100644 --- a/etc/ci/azure-posix.yml +++ b/etc/ci/azure-posix.yml @@ -30,9 +30,12 @@ jobs: displayName: '${{ pyver }} - Install Python' - script: | - python${{ pyver }} --version - echo "python${{ pyver }}" > PYTHON_EXECUTABLE - ./configure --clean && ./configure --dev + make dev + make envfile_testing + sudo mkdir /etc/scancodeio + sudo cp .env /etc/scancodeio + make postgres + make postgres-matchcodeio displayName: '${{ pyver }} - Configure' - script: $(test_suite)