diff --git a/.azure-pipelines-gh-pages.yml b/.azure-pipelines-gh-pages.yml index 238fa09a591a..0155af108b7d 100644 --- a/.azure-pipelines-gh-pages.yml +++ b/.azure-pipelines-gh-pages.yml @@ -7,9 +7,12 @@ trigger: jobs: - job: build_and_publish_docs + # Note: Still on ubuntu-20.04 with python3.8 because of + # https://github.com/python-babel/babel/issues/990 container: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-virtual-clang15 pool: vmImage: ubuntu-20.04 + displayName: Build and Publish Docs steps: - checkout: self diff --git a/.azure-pipelines-quictls.yml b/.azure-pipelines-quictls.yml index 42d3f5ba0c38..a510cd7b6436 100644 --- a/.azure-pipelines-quictls.yml +++ b/.azure-pipelines-quictls.yml @@ -17,7 +17,7 @@ parameters: jobs: - job: build_quictls - container: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-clang15 + container: ccfmsrc.azurecr.io/ccf/ci:30-05-2023-virtual-clang15 pool: 1es-dv4-focal strategy: diff --git a/.azure-pipelines-templates/checks.yml b/.azure-pipelines-templates/checks.yml index bf4096d49278..29dc04890be6 100644 --- a/.azure-pipelines-templates/checks.yml +++ b/.azure-pipelines-templates/checks.yml @@ -9,5 +9,5 @@ jobs: clean: true fetchDepth: 1 - - script: python3.8 scripts/extract-release-notes.py --target-git-version + - script: python3.10 scripts/extract-release-notes.py --target-git-version displayName: "Check presence of release notes entry" diff --git a/.azure-pipelines-templates/configure.yml b/.azure-pipelines-templates/configure.yml index 38a04e6e5bdd..6622c2f40b80 100644 --- a/.azure-pipelines-templates/configure.yml +++ b/.azure-pipelines-templates/configure.yml @@ -5,7 +5,7 @@ jobs: Codeql.SkipTaskAutoInjection: true skipComponentGovernanceDetection: true pool: - vmImage: "ubuntu-20.04" + vmImage: "ubuntu-22.04" steps: - checkout: self clean: true diff --git a/.azure-pipelines-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml index 192e666b07e7..2f616ef4ef22 100644 --- a/.azure-pipelines-templates/deploy_aci.yml +++ b/.azure-pipelines-templates/deploy_aci.yml @@ -11,7 +11,7 @@ jobs: Codeql.SkipTaskAutoInjection: true skipComponentGovernanceDetection: true pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 steps: - checkout: none @@ -26,7 +26,7 @@ jobs: skipComponentGovernanceDetection: true sshKey: $[ dependencies.generate_ssh_key.outputs['generate_ssh_key.sshKey'] ] pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 steps: - script: | env @@ -65,10 +65,10 @@ jobs: - script: | set -ex - python3.8 -m venv ./scripts/azure_deployment/.env + python3.10 -m venv ./scripts/azure_deployment/.env source ./scripts/azure_deployment/.env/bin/activate pip install -r ./scripts/azure_deployment/requirements.txt - python3.8 scripts/azure_deployment/arm_template.py deploy aci \ + python3.10 scripts/azure_deployment/arm_template.py deploy aci \ --subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \ --resource-group ccf-aci \ --region northeurope \ @@ -91,7 +91,7 @@ jobs: - job: deploy_secondary_aci displayName: "Deploy Secondary ACI" pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 dependsOn: - generate_ssh_key variables: @@ -132,10 +132,10 @@ jobs: - script: | set -ex - python3.8 -m venv ./scripts/azure_deployment/.env + python3.10 -m venv ./scripts/azure_deployment/.env source ./scripts/azure_deployment/.env/bin/activate pip install -r ./scripts/azure_deployment/requirements.txt - python3.8 scripts/azure_deployment/arm_template.py deploy aci \ + python3.10 scripts/azure_deployment/arm_template.py deploy aci \ --subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \ --resource-group ccf-aci \ --region northeurope \ @@ -185,7 +185,7 @@ jobs: - job: cleanup_aci displayName: "Cleanup ACI" pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 dependsOn: - generate_ssh_key - deploy_primary_aci @@ -219,10 +219,10 @@ jobs: - script: | set -ex - python3.8 -m venv ./scripts/azure_deployment/.env + python3.10 -m venv ./scripts/azure_deployment/.env source ./scripts/azure_deployment/.env/bin/activate pip install -r ./scripts/azure_deployment/requirements.txt - python3.8 scripts/azure_deployment/arm_template.py remove aci \ + python3.10 scripts/azure_deployment/arm_template.py remove aci \ --subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \ --resource-group ccf-aci \ --aci-type dynamic-agent \ @@ -234,7 +234,7 @@ jobs: - script: | source ./scripts/azure_deployment/.env/bin/activate if [[ ${{ parameters.secondaries.count }} != 0 ]]; then - python3.8 scripts/azure_deployment/arm_template.py remove aci \ + python3.10 scripts/azure_deployment/arm_template.py remove aci \ --subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \ --resource-group ccf-aci \ --aci-type dynamic-agent \ diff --git a/.azure-pipelines-templates/deploy_attestation_container.yml b/.azure-pipelines-templates/deploy_attestation_container.yml index b0f3f81fdbc2..122d5bbb8cdf 100644 --- a/.azure-pipelines-templates/deploy_attestation_container.yml +++ b/.azure-pipelines-templates/deploy_attestation_container.yml @@ -5,7 +5,7 @@ jobs: Codeql.SkipTaskAutoInjection: true skipComponentGovernanceDetection: true pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 steps: - template: azure_cli.yml parameters: @@ -22,10 +22,10 @@ jobs: - script: | set -ex - python3.8 -m venv ./scripts/azure_deployment/.env + python3.10 -m venv ./scripts/azure_deployment/.env source ./scripts/azure_deployment/.env/bin/activate pip install -r ./scripts/azure_deployment/requirements.txt - python3.8 scripts/azure_deployment/arm_template.py deploy aci \ + python3.10 scripts/azure_deployment/arm_template.py deploy aci \ --subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \ --resource-group attestationContainer \ --aci-type dynamic-agent \ @@ -40,7 +40,7 @@ jobs: - job: cleanup_aci displayName: "Cleanup Attestation Container" pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 dependsOn: - deploy_attestation_container - ${{ parameters.used_by }} @@ -54,10 +54,10 @@ jobs: - script: | set -ex - python3.8 -m venv ./scripts/azure_deployment/.env + python3.10 -m venv ./scripts/azure_deployment/.env source ./scripts/azure_deployment/.env/bin/activate pip install -r ./scripts/azure_deployment/requirements.txt - python3.8 scripts/azure_deployment/arm_template.py remove aci \ + python3.10 scripts/azure_deployment/arm_template.py remove aci \ --subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \ --resource-group attestationContainer \ --aci-type dynamic-agent \ @@ -68,7 +68,7 @@ jobs: - job: cleanup_container_image displayName: "Cleanup Attestation Container image" pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 dependsOn: - deploy_attestation_container - ${{ parameters.used_by }} diff --git a/.azure-pipelines-templates/install_others.yml b/.azure-pipelines-templates/install_others.yml index d67bcf54f574..9d36e8f7d708 100644 --- a/.azure-pipelines-templates/install_others.yml +++ b/.azure-pipelines-templates/install_others.yml @@ -1,7 +1,7 @@ steps: - script: | set -ex - python3.8 -m venv env + python3.10 -m venv env source ./env/bin/activate pip install -r requirements.txt pip install wheel diff --git a/.azure-pipelines-templates/matrix.yml b/.azure-pipelines-templates/matrix.yml index a19ff93979c1..5f879e7c8ef3 100644 --- a/.azure-pipelines-templates/matrix.yml +++ b/.azure-pipelines-templates/matrix.yml @@ -5,7 +5,7 @@ parameters: Hosted: container: virtual pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 Virtual: container: virtual pool: 1es-dv4-focal diff --git a/.azure-pipelines-templates/release.yml b/.azure-pipelines-templates/release.yml index a3f0cacbadca..22cf64bafde9 100644 --- a/.azure-pipelines-templates/release.yml +++ b/.azure-pipelines-templates/release.yml @@ -14,7 +14,7 @@ jobs: - script: | set -ex - python3.8 ./scripts/extract-release-notes.py --target-git-version | tee $(Build.BinariesDirectory)/rel-notes.md + python3.10 ./scripts/extract-release-notes.py --target-git-version | tee $(Build.BinariesDirectory)/rel-notes.md displayName: Extract release notes - script: | diff --git a/.azure-pipelines-templates/test_attestation_container.yml b/.azure-pipelines-templates/test_attestation_container.yml index bc8d6d07686d..d02eb29c3b89 100644 --- a/.azure-pipelines-templates/test_attestation_container.yml +++ b/.azure-pipelines-templates/test_attestation_container.yml @@ -8,7 +8,7 @@ jobs: dependsOn: ${{ parameters.depends_on }} condition: ${{ parameters.condition }} pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 timeoutInMinutes: 120 variables: Codeql.SkipTaskAutoInjection: true diff --git a/.azure-pipelines-templates/test_on_remote.yml b/.azure-pipelines-templates/test_on_remote.yml index 8e71773958f0..6b5378a44a05 100644 --- a/.azure-pipelines-templates/test_on_remote.yml +++ b/.azure-pipelines-templates/test_on_remote.yml @@ -8,7 +8,7 @@ jobs: dependsOn: ${{ parameters.depends_on }} condition: ${{ parameters.condition }} pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 timeoutInMinutes: 120 variables: runOn: ${{ parameters.run_on }} diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 31178b434ca8..f6253a2941cb 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -29,15 +29,15 @@ schedules: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:30-05-2023-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: snp - image: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-snp-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:30-05-2023-snp-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:30-05-2023-sgx options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /lib/modules:/lib/modules:ro variables: diff --git a/.daily.yml b/.daily.yml index cb15c22a6754..8dd7be15846c 100644 --- a/.daily.yml +++ b/.daily.yml @@ -25,15 +25,15 @@ schedules: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:30-05-2023-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE - container: snp - image: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-snp-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:30-05-2023-snp-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:30-05-2023-sgx options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx jobs: diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b1e7ef63dda3..2e5f5825f1ed 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "CCF Development Environment", - "image": "ccfmsrc.azurecr.io/ccf/ci:27-04-2023-virtual-clang15", + "image": "ccfmsrc.azurecr.io/ccf/ci:30-05-2023-virtual-clang15", "runArgs": [], "extensions": [ "eamodio.gitlens", diff --git a/.github/workflows/build-ci-container.yml b/.github/workflows/build-ci-container.yml index 092cdc0654f4..02eaafdbaf88 100644 --- a/.github/workflows/build-ci-container.yml +++ b/.github/workflows/build-ci-container.yml @@ -45,10 +45,10 @@ jobs: run: docker login -u $ACR_TOKEN_NAME -p ${{ secrets.ACR_CI_PUSH_TOKEN_PASSWORD }} $ACR_REGISTRY - name: Pull CI container - run: docker pull $ACR_REGISTRY/ccf/ci:27-04-2023-snp-clang15 + run: docker pull $ACR_REGISTRY/ccf/ci:30-05-2023-snp-clang15 - name: Build CCF CI SNP container - run: docker build -f docker/ccf_ci_built . --build-arg="base=ccfmsrc.azurecr.io/ccf/ci:27-04-2023-snp-clang15" --build-arg="platform=snp" -t $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD` + run: docker build -f docker/ccf_ci_built . --build-arg="base=ccfmsrc.azurecr.io/ccf/ci:30-05-2023-snp-clang15" --build-arg="platform=snp" -t $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD` - name: Push CI container run: docker push $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD` diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 58def75f64e0..ca476948e8bf 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -9,7 +9,7 @@ on: jobs: checks: runs-on: ubuntu-latest - container: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-virtual-clang15 + container: ccfmsrc.azurecr.io/ccf/ci:30-05-2023-virtual-clang15 steps: - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0c436a127101..2eb0598b6061 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -12,7 +12,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false diff --git a/.multi-thread.yml b/.multi-thread.yml index 27dbe5fc4056..a79962ceb99f 100644 --- a/.multi-thread.yml +++ b/.multi-thread.yml @@ -16,7 +16,7 @@ pr: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:30-05-2023-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro jobs: diff --git a/.stress.yml b/.stress.yml index 7aa671ef8b53..d00f9ea017ad 100644 --- a/.stress.yml +++ b/.stress.yml @@ -20,7 +20,7 @@ schedules: resources: containers: - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:30-05-2023-sgx options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index 35b1bdce08a4..b5007003b5f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [4.0.3] + +[4.0.3]: https://github.com/microsoft/CCF/releases/tag/ccf-4.0.3 + +- Updated Python from 3.8 to 3.10 (#5311). + ## [4.0.2] [4.0.2]: https://github.com/microsoft/CCF/releases/tag/ccf-4.0.2 @@ -17,11 +23,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - The `set_js_runtime_options` action now accepts `return_exception_details` and `log_exception_details` boolean options, which set the corresponding keys in the `public:ccf.gov.js_runtime_options` KV map. When enabled, a stack trace is respectively returned to the caller, and emitted to the log, on uncaught JS exceptions in application code. -## Changed +### Changed - For security reasons, OpenSSL `>=1.1.1f` must be first installed on the system (Ubuntu) before installing the CCF Debian package (#5227). -## Added +### Added - Added `ccf::historical::populate_service_endorsements` to public C++ API, allowing custom historical endpoints to do the same work as adapters. diff --git a/docker/ccf_ci_built b/docker/ccf_ci_built index 99115ff6e145..7e654307b191 100644 --- a/docker/ccf_ci_built +++ b/docker/ccf_ci_built @@ -4,7 +4,7 @@ # Latest image as of this change ARG platform=sgx -ARG base=ccfmsrc.azurecr.io/ccf/ci:27-04-2023-snp-clang-15 +ARG base=ccfmsrc.azurecr.io/ccf/ci:30-05-2023-snp-clang-15 FROM ${base} # SSH. Note that this could (should) be done in the base ccf_ci image instead diff --git a/getting_started/setup_vm/roles/ccf_build/tasks/install.yml b/getting_started/setup_vm/roles/ccf_build/tasks/install.yml index 9ebcd7ec16f9..2ff4becdf61c 100644 --- a/getting_started/setup_vm/roles/ccf_build/tasks/install.yml +++ b/getting_started/setup_vm/roles/ccf_build/tasks/install.yml @@ -1,3 +1,10 @@ +- name: Add Python repository + apt_repository: + repo: "ppa:deadsnakes/ppa" + state: present + update_cache: yes + become: yes + - name: Include vars for Clang include_vars: "clang{{ clang_version }}.yml" diff --git a/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml b/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml index 5b06f7487409..249ddd3b9ea0 100644 --- a/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml +++ b/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml @@ -7,8 +7,8 @@ debs: - libuv1-dev - libc++-{{ clang_ver }}-dev - libc++abi-{{ clang_ver }}-dev - - python3.8-dev - - python3.8-venv + - python3.10-dev + - python3.10-venv - llvm-{{ clang_ver }} - clang-{{ clang_ver }} - clang-format-11 diff --git a/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml b/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml index 50d5b2816a7f..7e8404788ea8 100644 --- a/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml +++ b/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml @@ -7,8 +7,8 @@ debs: - libuv1-dev - libc++-{{ clang_ver }}-dev - libc++abi-{{ clang_ver }}-dev - - python3.8-dev - - python3.8-venv + - python3.10-dev + - python3.10-venv - llvm-{{ clang_ver }} - clang-{{ clang_ver }} - clang-format-11 # On purpose, to avoid formatting conflicts diff --git a/livehtml.sh b/livehtml.sh index dd14ae1f3ea0..efe9aa12c695 100755 --- a/livehtml.sh +++ b/livehtml.sh @@ -17,7 +17,7 @@ fi echo "Setting up Python environment..." if [ ! -f "env/bin/activate" ] then - python3.8 -m venv env + python3.10 -m venv env fi source env/bin/activate diff --git a/python/setup.py b/python/setup.py index 9b32aa8c0157..35a030f2db02 100644 --- a/python/setup.py +++ b/python/setup.py @@ -37,7 +37,7 @@ "Programming Language :: Python :: 3", ], packages=[PACKAGE_NAME], - python_requires=">=3.8", + python_requires=">=3.10", install_requires=requirements, scripts=[ path.join(UTILITIES_PATH, "keygenerator.sh"), diff --git a/scripts/azure_deployment/arm_aci.py b/scripts/azure_deployment/arm_aci.py index eff9e5351ed2..ab17a9407895 100644 --- a/scripts/azure_deployment/arm_aci.py +++ b/scripts/azure_deployment/arm_aci.py @@ -178,7 +178,7 @@ def parse_aci_args(parser: ArgumentParser) -> Namespace: "--aci-image", help="The name of the image to deploy in the ACI", type=str, - default="ccfmsrc.azurecr.io/ccf/ci:27-04-2023-snp", + default="ccfmsrc.azurecr.io/ccf/ci:30-05-2023-snp", ) parser.add_argument( "--aci-type", diff --git a/scripts/check-cmake-format.sh b/scripts/check-cmake-format.sh index ce82070a04a3..0de867b8d823 100755 --- a/scripts/check-cmake-format.sh +++ b/scripts/check-cmake-format.sh @@ -30,7 +30,7 @@ fi if [ ! -f "scripts/env/bin/activate" ] then - python3.8 -m venv scripts/env + python3.10 -m venv scripts/env fi source scripts/env/bin/activate diff --git a/scripts/ci-checks.sh b/scripts/ci-checks.sh index ebb29ff349e9..e899443ecc49 100755 --- a/scripts/ci-checks.sh +++ b/scripts/ci-checks.sh @@ -94,7 +94,7 @@ popd > /dev/null endgroup group "Copyright notice headers" -python3.8 "$SCRIPT_DIR"/notice-check.py +python3.10 "$SCRIPT_DIR"/notice-check.py endgroup group "CMake format" @@ -109,7 +109,7 @@ group "Python dependencies" # Virtual Environment w/ dependencies for Python steps if [ ! -f "scripts/env/bin/activate" ] then - python3.8 -m venv scripts/env + python3.10 -m venv scripts/env fi source scripts/env/bin/activate diff --git a/src/apps/external_executor/protobuf/build.sh b/src/apps/external_executor/protobuf/build.sh index 548a1c766f66..c7c1c80a1911 100755 --- a/src/apps/external_executor/protobuf/build.sh +++ b/src/apps/external_executor/protobuf/build.sh @@ -14,7 +14,7 @@ GENERATED_DIR=${2} if [ ! -f "env/bin/activate" ] then - python3.8 -m venv env + python3.10 -m venv env fi source env/bin/activate diff --git a/tests/cimetrics_env.sh b/tests/cimetrics_env.sh index 1c198053000f..8c3d605d5e88 100755 --- a/tests/cimetrics_env.sh +++ b/tests/cimetrics_env.sh @@ -6,7 +6,7 @@ set -e if [ ! -f "env/bin/activate" ] then - python3.8 -m venv env + python3.10 -m venv env fi source env/bin/activate diff --git a/tests/recovery_benchmark.sh b/tests/recovery_benchmark.sh index 8c2a95581dcc..ed76a3a34862 100755 --- a/tests/recovery_benchmark.sh +++ b/tests/recovery_benchmark.sh @@ -93,7 +93,7 @@ if poll_for_service_open ${network_live_time} ${sandbox_pid}; then fi echo "** Load service" -python3.8 -m venv .recovery_bench_env +python3.10 -m venv .recovery_bench_env source .recovery_bench_env/bin/activate python -m pip -q install locust diff --git a/tests/sandbox/sandbox.sh b/tests/sandbox/sandbox.sh index add7c345d31e..9873a44cc7a8 100755 --- a/tests/sandbox/sandbox.sh +++ b/tests/sandbox/sandbox.sh @@ -53,7 +53,7 @@ done echo "Setting up Python environment..." if [ ! -f "${VENV_DIR}/bin/activate" ]; then - python3.8 -m venv "${VENV_DIR}" + python3.10 -m venv "${VENV_DIR}" fi # shellcheck source=/dev/null source "${VENV_DIR}"/bin/activate diff --git a/tests/test_install.sh b/tests/test_install.sh index 62fa82005562..124513e7de9a 100755 --- a/tests/test_install.sh +++ b/tests/test_install.sh @@ -51,7 +51,7 @@ if poll_for_service_open ${network_live_time}; then exit 1 fi -python3.8 -m venv env +python3.10 -m venv env # shellcheck source=/dev/null source env/bin/activate python -m pip install -e ../../../python diff --git a/tests/tests.sh b/tests/tests.sh index e77dd0e27dab..94c789abcd03 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -7,7 +7,7 @@ set -e echo "Setting up Python environment..." if [ ! -f "env/bin/activate" ] then - python3.8 -m venv env + python3.10 -m venv env fi source env/bin/activate