Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bundle versions being given to the scheduled workflows for testing on AKS and EKS. #1122

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/dependencies.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
"1.7":
K8S_VERSION: "1.24"
JUJU_VERSION: "2.9"
JUJU_VERSION_WITH_PATCH: "2.9.49"
UATS_BRANCH: "track/1.7"
"1.8":
K8S_VERSION: "1.29"
JUJU_VERSION: "3.4"
Expand Down
21 changes: 19 additions & 2 deletions .github/workflows/deploy-to-aks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:
- cron: "17 0 * * 2"
jobs:
preprocess-input:
if: ${{ github.event_name == 'workflow_dispatch' }}
runs-on: ubuntu-22.04
outputs:
processed_bundle_versions: ${{ steps.process_bundle_versions.outputs.bundle_versions }}
Expand All @@ -31,13 +32,29 @@ jobs:
- name: Process bundle versions
id: process_bundle_versions
run: python scripts/gh-actions/parse_versions.py "${{ inputs.bundle_version }}"


generate-bundle-versions-on-schedule:
if: ${{ github.event_name == 'schedule' }}
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install CLI tools
run: |
sudo snap install yq

- name: Create JSON array of bundle versions
run: |
bundle_versions=$(yq '. | keys' .github/dependencies.yaml -o=json)
echo "bundle_versions=${bundle_versions}" >> $GITHUB_OUTPUT

deploy-ckf-to-aks:
needs: preprocess-input
runs-on: ubuntu-22.04
strategy:
matrix:
bundle_version: ${{ fromJSON(needs.preprocess-input.outputs.processed_bundle_versions) }}
bundle_version: ${{ fromJSON(needs.preprocess-input.outputs.processed_bundle_versions) || fromJSON(jobs.generate-bundle-versions-on-schedule.outputs.bundle_versions) }}
fail-fast: false
env:
AZURE_CORE_OUTPUT: none
Expand Down
21 changes: 19 additions & 2 deletions .github/workflows/deploy-to-eks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:
- cron: "23 0 * * 2"
jobs:
preprocess-input:
if: ${{ github.event_name == 'workflow_dispatch' }}
runs-on: ubuntu-22.04
outputs:
processed_bundle_versions: ${{ steps.process_bundle_versions.outputs.bundle_versions }}
Expand All @@ -31,13 +32,29 @@ jobs:
- name: Process bundle versions
id: process_bundle_versions
run: python scripts/gh-actions/parse_versions.py "${{ inputs.bundle_version }}"


generate-bundle-versions-on-schedule:
if: ${{ github.event_name == 'schedule' }}
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install CLI tools
run: |
sudo snap install yq

- name: Create JSON array of bundle versions
run: |
bundle_versions=$(yq '. | keys' .github/dependencies.yaml -o=json)
echo "bundle_versions=${bundle_versions}" >> $GITHUB_OUTPUT

deploy-ckf-to-eks:
needs: preprocess-input
runs-on: ubuntu-22.04
strategy:
matrix:
bundle_version: ${{ fromJSON(needs.preprocess-input.outputs.processed_bundle_versions) }}
bundle_version: ${{ fromJSON(needs.preprocess-input.outputs.processed_bundle_versions) || fromJSON(jobs.generate-bundle-versions-on-schedule.outputs.bundle_versions) }}
fail-fast: false
env:
PYTHON_VERSION: "3.8"
Expand Down
2 changes: 1 addition & 1 deletion scripts/gh-actions/parse_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def parse_versions(input_versions):
return json_array

if __name__ == "__main__":
if len(sys.argv) < 1:
if len(sys.argv) < 2 or sys.argv[1] == "":
raise Exception("No bundle versions given as input.")

input_versions = sys.argv[1]
Expand Down
1 change: 1 addition & 0 deletions ye
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove this file

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bundle_versions=[""]