From eacb1b8a3d310bf19a093a3f0fe9e2e76eb13311 Mon Sep 17 00:00:00 2001 From: Dima Tisnek Date: Thu, 28 Nov 2024 10:44:24 +0900 Subject: [PATCH 1/2] ci: juju 3.6.0 is stable --- .github/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 62aab734..dfe55d16 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -77,7 +77,7 @@ jobs: - "3.3/stable" - "3.4/stable" - "3.5/stable" - - "3.6/candidate" + - "3.6/stable" steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -133,6 +133,7 @@ jobs: - "3.3/stable" - "3.4/stable" - "3.5/stable" + - "3.6/stable" steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 From dda951f050f88eba8cc3d016e281c3278cf00f4f Mon Sep 17 00:00:00 2001 From: Dima Tisnek Date: Thu, 28 Nov 2024 10:45:30 +0900 Subject: [PATCH 2/2] ci: remove the broken disabled tests --- .github/workflows/test_candidate.yaml | 72 --------------------------- .github/workflows/test_edge.yaml | 72 --------------------------- 2 files changed, 144 deletions(-) delete mode 100644 .github/workflows/test_candidate.yaml delete mode 100644 .github/workflows/test_edge.yaml diff --git a/.github/workflows/test_candidate.yaml b/.github/workflows/test_candidate.yaml deleted file mode 100644 index d0c236d3..00000000 --- a/.github/workflows/test_candidate.yaml +++ /dev/null @@ -1,72 +0,0 @@ -name: Nightly release candidate testing - -on: - schedule: - - cron: "0 0 * * *" # Run at 12AM UTC, every day - -jobs: - candidate-integration: - name: Edge integration - timeout-minutes: 150 - runs-on: ubuntu-latest - strategy: - matrix: - python: - - "3.8" - - "3.9" - - "3.10" - steps: - - name: Download artifact from previous workflow - id: download_artifact - uses: dawidd6/action-download-artifact@v2 - with: - workflow_conclusion: success - name: juju-last-candidate-version - if_no_artifact_found: ignore - - name: Check if there is a new candidate - shell: bash - run: | - candidate=$(snap info juju | grep 3.1/candidate | awk '{print $2}') - last_tested=NA - if [ -f juju-last-candidate-version ]; then - last_tested=$(cat juju-last-candidate-version) - fi - echo "Last tested was $last_tested" - echo "Latest juju version found is $candidate" - next_test=NA - if [[ "$candidate" == "^" ]]; then - echo "No candidate to test" - else - if [[ "$candidate" == "$last_tested" ]]; then - echo "Candidate $candidate was already tested" - else - echo "Candidate $candidate has to be tested" - next_test="$candidate" - fi - fi - echo "next-test=$next_test" >> $GITHUB_ENV - echo "$next_test" > ~/juju-last-candidate-version - - name: Check out code - uses: actions/checkout@v4 - if: ${{ env.next-test != 'NA' }} - - name: Setup Python - if: ${{ env.next-test != 'NA' }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python }} - - name: Setup operator environment - if: ${{ env.next-test != 'NA' }} - uses: charmed-kubernetes/actions-operator@main - with: - provider: lxd - juju-channel: 3.4/candidate - - name: Run integration - if: ${{ env.next-test != 'NA' }} - # Force one single concurrent test - run: tox -e integration -- -n 1 - - name: Upload artifact - if: ${{ env.next-test != 'NA' }} - uses: actions/upload-artifact@v4 - with: - name: juju-last-candidate-version - path: ~/juju-last-candidate-version diff --git a/.github/workflows/test_edge.yaml b/.github/workflows/test_edge.yaml deleted file mode 100644 index 27a949cf..00000000 --- a/.github/workflows/test_edge.yaml +++ /dev/null @@ -1,72 +0,0 @@ -name: Nightly release edge testing - -on: - schedule: - - cron: "0 0 * * *" # Run at 12AM UTC, every day - -jobs: - candidate-integration: - name: Edge integration - timeout-minutes: 150 - runs-on: ubuntu-latest - strategy: - matrix: - python: - - "3.8" - - "3.9" - - "3.10" - steps: - - name: Download artifact from previous workflow - id: download_artifact - uses: dawidd6/action-download-artifact@v2 - with: - workflow_conclusion: success - name: juju-last-edge-version - if_no_artifact_found: ignore - - name: Check if there is a new candidate - shell: bash - run: | - edge=$(snap info juju | grep 3.1/edge | awk '{print $2}') - last_tested=NA - if [ -f juju-last-edge-version ]; then - last_tested=$(cat juju-last-edge-version) - fi - echo "Last tested was $last_tested" - echo "Latest juju version found is $edge" - next_test=NA - if [[ "$edge" == "^" ]]; then - echo "No edge to test" - else - if [[ "$edge" == "$last_tested" ]]; then - echo "Edge $edge was already tested" - else - echo "Edge $edge has to be tested" - next_test="$edge" - fi - fi - echo "next-test=$next_test" >> $GITHUB_ENV - echo "$next_test" > ~/juju-last-edge-version - - name: Check out code - uses: actions/checkout@v4 - if: ${{ env.next-test != 'NA' }} - - name: Setup Python - if: ${{ env.next-test != 'NA' }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python }} - - name: Setup operator environment - if: ${{ env.next-test != 'NA' }} - uses: charmed-kubernetes/actions-operator@main - with: - provider: lxd - juju-channel: 3.4/edge - - name: Run integration - if: ${{ env.next-test != 'NA' }} - # Force one single concurrent test - run: tox -e integration -- -n 1 - - name: Upload artifact - if: ${{ env.next-test != 'NA' }} - uses: actions/upload-artifact@v4 - with: - name: juju-last-edge-version - path: ~/juju-last-edge-version