Skip to content

Commit

Permalink
Include juju 3.1/stable when running canary and integration tests.
Browse files Browse the repository at this point in the history
Should have caught issue #352 earlier. Increase our testing coverage to
help fill the gap.
  • Loading branch information
hmlanigan committed Dec 5, 2023
1 parent 2e8c500 commit a6bd6af
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ jobs:
- "1.4.*"
- "1.5.*"
- "1.6.*"
juju:
- "2.9/stable"
- "3.1/stable"
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
Expand All @@ -55,7 +58,7 @@ jobs:
uses: charmed-kubernetes/actions-operator@main
with:
provider: ${{ matrix.cloud }}
juju-channel: 2.9/stable
juju-channel: ${{ matrix.juju }}
- name: "Set environment to configure provider"
# language=bash
run: |
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/test_add_machine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@ on:
paths-ignore:
- "README.md"
- "project-docs/**"
- ".github/ISSUE_TEMPLATE/**"
- ".github/PULL_REQUEST_TEMPLATE.md"
push:
branches:
- "main"
paths-ignore:
- "README.md"
- "project-docs/**"
- ".github/ISSUE_TEMPLATE/**"
- ".github/PULL_REQUEST_TEMPLATE.md"

# Testing only needs permissions to read the repository contents.
permissions:
Expand Down Expand Up @@ -46,6 +50,9 @@ jobs:
- "lxd"
terraform:
- "1.6.*"
juju:
- "2.9/stable"
- "3.1/stable"
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
Expand All @@ -63,7 +70,7 @@ jobs:
uses: charmed-kubernetes/actions-operator@main
with:
provider: ${{ matrix.cloud }}
juju-channel: 2.9/stable
juju-channel: ${{ matrix.juju }}
- name: "Set environment to configure provider"
# language=bash
run: |
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/test_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@ on:
paths-ignore:
- "README.md"
- "project-docs/**"
- ".github/ISSUE_TEMPLATE/**"
- ".github/PULL_REQUEST_TEMPLATE.md"
push:
branches:
- "main"
paths-ignore:
- "README.md"
- "project-docs/**"
- ".github/ISSUE_TEMPLATE/**"
- ".github/PULL_REQUEST_TEMPLATE.md"

# Testing only needs permissions to read the repository contents.
permissions:
Expand Down Expand Up @@ -46,6 +50,9 @@ jobs:
- "1.4.*"
- "1.5.*"
- "1.6.*"
juju:
- "2.9/stable"
- "3.1/stable"
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
Expand All @@ -61,7 +68,7 @@ jobs:
uses: charmed-kubernetes/actions-operator@main
with:
provider: ${{ matrix.cloud }}
juju-channel: 2.9/stable
juju-channel: ${{ matrix.juju }}
- name: "Set environment to configure provider"
# language=bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_new_candidates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
matrix:
juju_track:
- "2.9"
- "3.1"
juju_risk:
# - "candidate"
- "edge"
terraform:
- "1.5.*"
Expand Down

0 comments on commit a6bd6af

Please sign in to comment.