Merge pull request #6536 from opsmill/fac-stable-into-develop

Merge stable into develop

Author: fatih-acar

.devcontainer/Dockerfile

@@ -36,7 +36,7 @@ USER vscode
 
 RUN pip install toml invoke
 
-RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.5 python3 - \
+RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.1.3 python3 - \
     && echo "export PATH=\"$HOME/.local/bin:$PATH\"" >> $HOME/.bashrc
 
 RUN bash -c "$(curl -sL https://get.containerlab.dev)"

.github/workflows/ci-docker-image.yml

@@ -44,7 +44,12 @@ env:
   DOCKERFILE: "development/Dockerfile"
 
 jobs:
+  prepare-environment:
+    uses: ./.github/workflows/define-versions.yml
   build:
+    needs: prepare-environment
+    env:
+      POETRY_VERSION: ${{ needs.prepare-environment.outputs.POETRY_VERSION }}
     runs-on:
       group: huge-runners
     steps:

.github/workflows/ci.yml

@@ -30,7 +30,9 @@ env:
   METRICS_ENDPOINT: ${{ secrets.METRICS_ENDPOINT }}
 
 jobs:
-   # ------------------------------------------ Check Files Changes  ------------------------------------------
+  prepare-environment:
+    uses: ./.github/workflows/define-versions.yml
+  # ------------------------------------------ Check Files Changes  ------------------------------------------
   files-changed:
     name: Detect which file has changed
     runs-on: ubuntu-latest
@@ -61,7 +63,7 @@ jobs:
           token: ${{ github.token }}
           filters: .github/file-filters.yml
 
- # ------------------------------------------ All Linter  ------------------------------------------
+  # ------------------------------------------ All Linter  ------------------------------------------
   yaml-lint:
     if: needs.files-changed.outputs.yaml == 'true'
     needs: ["files-changed"]
@@ -161,7 +163,7 @@ jobs:
 
   infrahub-testcontainers-check:
     if: needs.files-changed.outputs.infrahub_poetry_files == 'true'
-    needs: ["files-changed"]
+    needs: ["prepare-environment", "files-changed"]
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
@@ -177,7 +179,7 @@ jobs:
 
       - name: "Setup Python environment"
         run: |
-          pipx install poetry==1.8.5
+          pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
           poetry config virtualenvs.create true --local
           poetry env use 3.12
 
@@ -404,13 +406,14 @@ jobs:
       !contains(needs.*.result, 'cancelled') &&
       (needs.files-changed.outputs.backend == 'true' ||
       needs.files-changed.outputs.testcontainers == 'true')
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+    needs: ["prepare-environment", "files-changed", "yaml-lint", "python-lint"]
     runs-on:
       group: huge-runners
     timeout-minutes: 45
     env:
       INFRAHUB_DB_TYPE: neo4j
       PYTEST_XDIST_WORKER_COUNT: 1
+      POETRY_VERSION: ${{ needs.prepare-environment.outputs.POETRY_VERSION }}
     steps:
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
@@ -509,7 +512,7 @@ jobs:
       !contains(needs.*.result, 'cancelled') &&
       (needs.files-changed.outputs.backend == 'true' ||
       needs.files-changed.outputs.documentation == 'true')
-    needs: ["files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
+    needs: ["prepare-environment", "files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
@@ -522,7 +525,7 @@ jobs:
           python-version: 3.12
       - name: "Setup environment"
         run: |
-          pipx install poetry==1.8.5
+          pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
           poetry config virtualenvs.create true --local
           poetry env use 3.12
           pip install invoke toml
@@ -625,7 +628,7 @@ jobs:
       !contains(needs.*.result, 'failure') &&
       !contains(needs.*.result, 'cancelled') &&
       (needs.files-changed.outputs.python == 'true') || (needs.files-changed.outputs.documentation == 'true')
-    needs: ["files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
+    needs: ["prepare-environment", "files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
     runs-on: "ubuntu-22.04"
     timeout-minutes: 5
     steps:
@@ -639,7 +642,7 @@ jobs:
           python-version: "3.12"
       - name: "Setup Python environment"
         run: |
-          pipx install poetry==1.8.5
+          pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
           poetry config virtualenvs.create true --local
           poetry env use 3.12
       - name: "Install dependencies"
@@ -705,6 +708,7 @@ jobs:
       run:
         working-directory: ./frontend/app
     needs:
+      - prepare-environment
       - javascript-lint
       - files-changed
       - yaml-lint
@@ -724,6 +728,7 @@ jobs:
           - name: E2E-testing-playwright
             env:
               INFRAHUB_DB_TYPE: neo4j
+              POETRY_VERSION: ${{ needs.prepare-environment.outputs.POETRY_VERSION }}
           # - name: E2E-testing-playwright-nats
           #   env:
           #     INFRAHUB_DB_TYPE: neo4j

.github/workflows/define-versions.yml

@@ -0,0 +1,14 @@
+---
+# yamllint disable rule:truthy rule:truthy rule:line-length
+name: "Define versions"
+on:
+  workflow_call:
+    outputs:
+      POETRY_VERSION:
+        value: "2.1.3"
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    steps:
+      - run: "true"

.github/workflows/poetry-check.yml

@@ -9,7 +9,10 @@ on:
         description: "Directory in which poetry check will be executed"
         default: "./"
 jobs:
+  prepare-environment:
+    uses: ./.github/workflows/define-versions.yml
   poetry_check:
+    needs: prepare-environment
     runs-on: "ubuntu-latest"
     steps:
       - name: "Check out repository code"
@@ -22,7 +25,7 @@ jobs:
           python-version: "3.12"
       - name: "Setup environment"
         run: |
-          pipx install poetry==1.8.5
+          pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
       - name: "Validate pyproject.toml and consistency with poetry.lock"
         run: |
           poetry check

.github/workflows/publish-pypi.yml

@@ -28,12 +28,15 @@ on:
         default: false
 
 jobs:
+  prepare-environment:
+    uses: ./.github/workflows/define-versions.yml
   publish_to_pypi:
     name: "Publish Infrahub-Server and Infrahub-Testcontainers to PyPI"
     runs-on: "ubuntu-22.04"
     strategy:
       matrix:
         package_dir: ["", "python_testcontainers"]
+    needs: prepare-environment
     steps:
       - name: "Set up Python"
         uses: "actions/setup-python@v5"
@@ -42,7 +45,7 @@ jobs:
       - name: "Install Poetry"
         uses: "snok/install-poetry@v1"
         with:
-          version: 1.8.5
+          version: ${{ needs.prepare-environment.outputs.POETRY_VERSION }}
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true

.github/workflows/release.yml

@@ -8,8 +8,11 @@ on:
       - published
 
 jobs:
+  prepare-environment:
+    uses: ./.github/workflows/define-versions.yml
   check_release:
     runs-on: ubuntu-22.04
+    needs: prepare-environment
     outputs:
       is_prerelease: ${{ steps.release.outputs.is_prerelease }}
       is_devrelease: ${{ steps.release.outputs.is_devrelease }}
@@ -30,7 +33,7 @@ jobs:
       - name: "Install Poetry"
         uses: "snok/install-poetry@v1"
         with:
-          version: 1.8.5
+          version: ${{ needs.prepare-environment.outputs.POETRY_VERSION }}
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true

.github/workflows/update-compose-file-and-chart.yml

@@ -18,8 +18,11 @@ on:
       - closed
 
 jobs:
+  prepare-environment:
+    uses: ./.github/workflows/define-versions.yml
   update-docker-compose:
     runs-on: ubuntu-latest
+    needs: prepare-environment
     if: |
       github.event_name == 'push' ||
       (github.event_name == 'pull_request' && github.event.pull_request.merged == true &&
@@ -38,7 +41,7 @@ jobs:
           python-version: 3.12
       - name: "Setup environment"
         run: |
-          pipx install poetry==1.8.5
+          pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
           poetry config virtualenvs.prefer-active-python true
       - name: "Install Package"
         run: "poetry install --all-extras"

.github/workflows/version-upgrade.yml

@@ -26,6 +26,8 @@ env:
   VMAGENT_PORT: 0
 
 jobs:
+  prepare-environment:
+    uses: ./.github/workflows/define-versions.yml
   migration-tests:
     strategy:
       fail-fast: false
@@ -39,8 +41,10 @@ jobs:
     runs-on:
       group: huge-runners
     timeout-minutes: 120
+    needs: prepare-environment
     env:
       INFRAHUB_DB_TYPE: neo4j
+      POETRY_VERSION: ${{ needs.prepare-environment.outputs.POETRY_VERSION }}
     steps:
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
@@ -52,7 +56,7 @@ jobs:
           python-version: 3.12
       - name: "Setup python environment"
         run: |
-          pipx install poetry==1.8.5
+          pipx install poetry==${{ env.POETRY_VERSION }}
           poetry config virtualenvs.prefer-active-python true
           pip install invoke toml
       - name: "Install Package"

development/Dockerfile

@@ -2,6 +2,7 @@
 # STAGE : Base Python Image
 # ****************************************************************
 ARG PYTHON_VER=3.12
+ARG POETRY_VER
 FROM docker.io/python:${PYTHON_VER}-slim AS base
 
 ENV PYTHONUNBUFFERED 1
@@ -24,7 +25,7 @@ RUN apt-get update && \
     tee /etc/apt/sources.list.d/docker.list > /dev/null && \
     apt-get update && \
     apt-get install --no-install-recommends -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin && \
-    curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.5 python3 - && \
+    curl -sSL https://install.python-poetry.org | POETRY_VERSION=$POETRY_VER python3 - && \
     apt-get autoremove -y && \
     apt-get clean all && \
     rm -rf /var/lib/apt/lists/* && \