From a7756cc877c9680ade95dc4d4f99f502e9b8feea Mon Sep 17 00:00:00 2001 From: Carlos Date: Thu, 8 Feb 2024 14:36:20 +0100 Subject: [PATCH 1/3] Update pkg build/test to use mongo 4.4 --- .circleci/config.yml | 11 ++++++----- CHANGELOG.rst | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ee884fcf1e..af715bdab0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,7 +44,7 @@ jobs: integration: docker: - image: circleci/python:3.8 - - image: mongo:4.0 + - image: mongo:4.4 - image: rabbitmq:3 working_directory: ~/st2 steps: @@ -57,8 +57,9 @@ jobs: name: Install Mongo Shell command: | set -x - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 - echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/4.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.0.list + sudo apt-get -qq -y install gnupg curl + curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/mongodb-server-4.4.gpg + echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.4.list sudo apt-get -qq -y update sudo apt-get -qq -y install mongodb-org-shell - run: @@ -80,7 +81,7 @@ jobs: lint: docker: - image: circleci/python:3.8 - - image: mongo:4.0 + - image: mongo:4.4 - image: rabbitmq:3 working_directory: ~/st2 steps: @@ -182,7 +183,7 @@ jobs: name: Copy st2-packages files to build containers command: | # creating dummy container which will hold a volume with data files - docker create -v /root/st2-packages -v ${ST2_GITDIR} -v /root/build -v /var/log/st2 -v /root/.cache/pip -v /tmp/wheelhouse --name st2-packages-vol alpine:3.4 /bin/true + docker create -v /root/st2-packages -v ${ST2_GITDIR} -v /root/build -v /var/log/st2 -v /root/.cache/pip -v /tmp/wheelhouse --name st2-packages-vol alpine:3.12 /bin/true # copy st2-packages data files into this volume docker cp ~/st2-packages st2-packages-vol:/root # copy st2 source files into this volume diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c86714fc11..b83d9e0e52 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -19,6 +19,7 @@ Changed * Drop Python 3.6 testing in CircleCI. #6080 Contributed by (@philipphomberger Schwarz IT KG) * Refactor `tools/launchdev.sh` to use `tmux` instead of `screen`. #6186 (by @nzlosh and @cognifloyd) +* Updated package build container environment to use py3.8 and mongo4.4 #6129 Added ~~~~~ From 8c7bf0534c079e3739219ad18ca4d1e9db074619 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 25 Apr 2024 09:54:32 -0500 Subject: [PATCH 2/3] constrain coverage --- test-requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 41a7aca8df..5bfa09f759 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,5 @@ -coverage +# 7.5 causing errors with orquesta integration tests (probably interaction w/ nose) +coverage<7.5 pep8==1.7.1 st2flake8==0.1.0 astroid==2.5.6 From f6b1bbe19ae6ccc13f36c16191568bcc16bdbd09 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 25 Apr 2024 10:06:56 -0500 Subject: [PATCH 3/3] bump py 3.8.10->3.8.18 to workaround GHA failure --- .github/workflows/ci.yaml | 14 +++++++------- .github/workflows/microbenchmarks.yaml | 2 +- .github/workflows/orquesta-integration-tests.yaml | 2 +- .github/workflows/test.yaml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d6c19a379e..90f6cc0c5e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -57,11 +57,11 @@ jobs: - name: 'Lint Checks (black, flake8, etc.)' task: 'ci-checks' python-version-short: '3.8' - python-version: '3.8.10' + python-version: '3.8.18' - name: 'Compile (pip deps, pylint, etc.)' task: 'ci-compile' python-version-short: '3.8' - python-version: '3.8.10' + python-version: '3.8.18' - name: 'Lint Checks (black, flake8, etc.)' task: 'ci-checks' python-version-short: '3.9' @@ -314,13 +314,13 @@ jobs: nosetests_node_total: 2 nosetests_node_index: 0 python-version-short: '3.8' - python-version: '3.8.10' + python-version: '3.8.18' - name: 'Unit Tests (chunk 2)' task: 'ci-unit' nosetests_node_total: 2 nosetests_node_index: 1 python-version-short: '3.8' - python-version: '3.8.10' + python-version: '3.8.18' - name: 'Unit Tests (chunk 1)' task: 'ci-unit' nosetests_node_total: 2 @@ -489,19 +489,19 @@ jobs: nosetests_node_total: 1 nosetests_node_index: 0 python-version-short: '3.8' - python-version: '3.8.10' + python-version: '3.8.18' - name: 'Integration Tests (chunk 1)' task: 'ci-integration' nosetests_node_total: 2 nosetests_node_index: 0 python-version-short: '3.8' - python-version: '3.8.10' + python-version: '3.8.18' - name: 'Integration Tests (chunk 2)' task: 'ci-integration' nosetests_node_total: 2 nosetests_node_index: 1 python-version-short: '3.8' - python-version: '3.8.10' + python-version: '3.8.18' - name: 'Pack Tests' task: 'ci-packs-tests' nosetests_node_total: 1 diff --git a/.github/workflows/microbenchmarks.yaml b/.github/workflows/microbenchmarks.yaml index c44deb6ac3..27e2813cc3 100644 --- a/.github/workflows/microbenchmarks.yaml +++ b/.github/workflows/microbenchmarks.yaml @@ -39,7 +39,7 @@ jobs: nosetests_node_total: 1 nosetests_node_index: 0 python-version-short: '3.8' - python-version: '3.8.10' + python-version: '3.8.18' - name: 'Microbenchmarks' task: 'micro-benchmarks' nosetests_node_total: 1 diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml index ee557b8500..33476236b1 100644 --- a/.github/workflows/orquesta-integration-tests.yaml +++ b/.github/workflows/orquesta-integration-tests.yaml @@ -60,7 +60,7 @@ jobs: nosetests_node_total: 1 nosetests_node_index: 0 python-version-short: '3.8' - python-version: '3.8.10' + python-version: '3.8.18' - name: 'Integration Tests (Orquesta)' task: 'ci-orquesta' nosetests_node_total: 1 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 949f0258b6..006be654bc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -34,7 +34,7 @@ jobs: include: - name: 'Test (pants runs: pytest)' python-version-short: '3.8' - python-version: '3.8.10' + python-version: '3.8.18' - name: 'Test (pants runs: pytest)' python-version-short: '3.9' python-version: '3.9.14'