Skip to content

CI: Consolidate upload jobs #114

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.

Sign up for GitHub

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

Merged
sfraint merged 3 commits into from
Sep 8, 2022
Merged

CI: Consolidate upload jobs #114

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
720c59a
simplify upload workflow
sfraint Sep 8, 2022
7b21acf
trigger on branch
sfraint Sep 8, 2022
5b45a64
Revert "trigger on branch"
sfraint Sep 8, 2022
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
59 changes: 9 additions & 50 deletions .github/workflows/cross_version_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,14 @@ on:
jobs:
# Initial checks and build artifacts
precommit:
if: github.event_name != 'workflow_dispatch'
uses: ./.github/workflows/reusable-precommit.yml
with:
BATFISH_GITHUB_BATFISH_REPO: 'batfish/batfish'
BATFISH_GITHUB_BATFISH_REF: 'master'
BATFISH_GITHUB_PYBATFISH_REPO: 'batfish/pybatfish'
BATFISH_GITHUB_PYBATFISH_REF: 'master'
BATFISH_GITHUB_BATFISH_REPO: "${{ github.event.inputs.batfish_repo || 'batfish/batfish' }}"
BATFISH_GITHUB_BATFISH_REF: "${{ github.event.inputs.batfish_ref || 'master' }}"
BATFISH_GITHUB_PYBATFISH_REPO: "${{ github.event.inputs.pybatfish_repo || 'batfish/pybatfish' }}"
BATFISH_GITHUB_PYBATFISH_REF: "${{ github.event.inputs.pybatfish_ref || 'master' }}"
# Integration tests
test:
if: github.event_name != 'workflow_dispatch'
needs: precommit
uses: ./.github/workflows/reusable-integration-tests.yml
with:
Expand All @@ -49,58 +47,19 @@ jobs:
run_cross_version_tests: true
# Push public artifacts
upload:
if: github.event_name != 'workflow_dispatch'
needs:
- precommit
- test
uses: ./.github/workflows/reusable-upload.yml
with:
bf_version: ${{ needs.precommit.outputs.bf_version }}
# Consider each 8AM Pacific scheduled build as a release candidate
queue_prod_release: ${{ github.event.schedule == '0 15 * * *' }}
# Consider manual builds or 8AM Pacific scheduled builds as a release candidate
queue_prod_release: ${{ github.event_name == 'workflow_dispatch' || github.event.schedule == '0 15 * * *' }}
test_tag: "test-${{ needs.precommit.outputs.bf_version }}"
release_tag: "${{ needs.precommit.outputs.bf_version }}"
secrets:
PYBATFISH_TEST_PYPI_TOKEN: ${{ secrets.PYBATFISH_TEST_PYPI_TOKEN }}
PYBATFISH_PYPI_TOKEN: ${{ secrets.PYBATFISH_PYPI_TOKEN }}
BATFISH_DOCKER_LOGIN_TOKEN: ${{ secrets.BATFISH_DOCKER_LOGIN_TOKEN }}
OPEN_SOURCE_BUILDKITEBOT_PUBLIC_REPO_TOKEN: ${{ secrets.OPEN_SOURCE_BUILDKITEBOT_PUBLIC_REPO_TOKEN }}

# Initial checks and build artifacts
precommit_manual_trigger:
if: github.event_name == 'workflow_dispatch'
uses: ./.github/workflows/reusable-precommit.yml
with:
BATFISH_GITHUB_BATFISH_REPO: "${{ github.event.inputs.batfish_repo }}"
BATFISH_GITHUB_BATFISH_REF: "${{ github.event.inputs.batfish_ref }}"
BATFISH_GITHUB_PYBATFISH_REPO: "${{ github.event.inputs.pybatfish_repo }}"
BATFISH_GITHUB_PYBATFISH_REF: "${{ github.event.inputs.pybatfish_ref }}"
# Integration tests
test_manual_trigger:
if: github.event_name == 'workflow_dispatch'
needs: precommit_manual_trigger
uses: ./.github/workflows/reusable-integration-tests.yml
with:
bf_version: ${{ needs.precommit_manual_trigger.outputs.bf_version }}
bf_test_artifact_age: "90"
bf_min_release_test_count: "3"
pybf_min_release_test_count: "3"
run_cross_version_tests: true
# Push public artifacts
upload_manual_trigger:
if: github.event_name == 'workflow_dispatch'
needs:
- precommit_manual_trigger
- test_manual_trigger
uses: ./.github/workflows/reusable-upload.yml
with:
bf_version: ${{ needs.precommit_manual_trigger.outputs.bf_version }}
queue_prod_release: true
test_tag: "test-${{ needs.precommit_manual_trigger.outputs.bf_version }}"
release_tag: "${{ needs.precommit_manual_trigger.outputs.bf_version }}"
BATFISH_GITHUB_BATFISH_REPO: "${{ github.event.inputs.batfish_repo }}"
BATFISH_GITHUB_PYBATFISH_REPO: "${{ github.event.inputs.pybatfish_repo }}"
BATFISH_GITHUB_PYBATFISH_REF: "${{ github.event.inputs.pybatfish_ref }}"
BATFISH_GITHUB_BATFISH_REPO: "${{ github.event.inputs.batfish_repo || 'batfish/batfish' }}"
BATFISH_GITHUB_PYBATFISH_REPO: "${{ github.event.inputs.pybatfish_repo || 'batfish/pybatfish' }}"
BATFISH_GITHUB_PYBATFISH_REF: "${{ github.event.inputs.pybatfish_ref || 'master' }}"
secrets:
PYBATFISH_TEST_PYPI_TOKEN: ${{ secrets.PYBATFISH_TEST_PYPI_TOKEN }}
PYBATFISH_PYPI_TOKEN: ${{ secrets.PYBATFISH_PYPI_TOKEN }}
Expand Down