Skip to content

Commit

Permalink
CI improvements (#2080)
Browse files Browse the repository at this point in the history
* Move opa ci to new ci workflow

* change retention of logs to 1 day

* revert opa to extract to separate pr
  • Loading branch information
moukoublen committed Apr 8, 2024
1 parent 6554efe commit 84229c2
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 15 deletions.
8 changes: 6 additions & 2 deletions .github/actions/aws-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,19 @@ runs:
run: poetry run pytest -k "aws" --alluredir=./allure/results/ --clean-alluredir

- name: Upload test results
if: ${{ success() || failure() }}
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: allure-results-ci-aws
path: tests/allure/results/
overwrite: true

- if: ${{ (success() || failure()) && inputs.debug == 'true' }}
- if: ${{ failure() || cancelled() || inputs.debug == 'true' }}
name: Upload cloudbeat logs
uses: actions/upload-artifact@v4
with:
name: cloubeat-logs-ci-aws
path: logs/
if-no-files-found: warn
retention-days: 1
overwrite: true
8 changes: 6 additions & 2 deletions .github/actions/azure-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,19 @@ runs:
run: poetry run pytest -k "azure" --alluredir=./allure/results/ --clean-alluredir

- name: Upload test results
if: ${{ success() || failure() }}
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: allure-results-ci-azure
path: tests/allure/results/
overwrite: true

- if: ${{ (success() || failure()) && inputs.debug == 'true' }}
- if: ${{ failure() || cancelled() || inputs.debug == 'true' }}
name: Upload cloudbeat logs
uses: actions/upload-artifact@v4
with:
name: cloubeat-logs-ci-azure
path: logs/
if-no-files-found: warn
retention-days: 1
overwrite: true
8 changes: 6 additions & 2 deletions .github/actions/cnvm-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,19 @@ runs:
poetry run pytest -k "cnvm" --alluredir=./allure/results/ --clean-alluredir
- name: Upload test results
if: ${{ success() || failure() }}
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: allure-results-ci-cnvm
path: tests/allure/results/
overwrite: true

- if: ${{ (success() || failure()) && inputs.debug == 'true' }}
- if: ${{ failure() || cancelled() || inputs.debug == 'true' }}
name: Upload cloudbeat logs
uses: actions/upload-artifact@v4
with:
name: cloubeat-logs-ci-cnvm
path: logs/
if-no-files-found: warn
retention-days: 1
overwrite: true
3 changes: 3 additions & 0 deletions .github/actions/docker-images/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ runs:
with:
name: docker-images
path: ${{ inputs.docker-images-folder }}
if-no-files-found: error
retention-days: 2
overwrite: true

- if: ${{ inputs.build-docker-images == 'false' }}
name: Download docker images
Expand Down
8 changes: 6 additions & 2 deletions .github/actions/gcp-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,19 @@ runs:
poetry run pytest -k "cspm_gcp" --alluredir=./allure/results/ --clean-alluredir --maxfail=4
- name: Upload test results
if: ${{ success() || failure() }}
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: allure-results-ci-gcp
path: tests/allure/results/
overwrite: true

- if: ${{ (success() || failure()) && inputs.debug == 'true' }}
- if: ${{ failure() || cancelled() || inputs.debug == 'true' }}
name: Upload cloudbeat logs
uses: actions/upload-artifact@v4
with:
name: cloubeat-logs-ci-gcp
path: logs/
if-no-files-found: warn
retention-days: 1
overwrite: true
3 changes: 2 additions & 1 deletion .github/actions/k8s-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ runs:
run: just run-tests ${{ inputs.test-target }} kind-${{ inputs.kind-config }}

- name: Upload Test Results
if: ${{ success() || failure() }}
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: allure-results-ci-k8s-${{ inputs.test-target }}-${{ inputs.kind-config }}
path: tests/allure/results/
overwrite: true
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ jobs:
with:
name: coverage-file
path: cover.out
overwrite: true

- name: Send coverage
env:
Expand Down Expand Up @@ -188,7 +189,7 @@ jobs:
needs: [ init-hermit ]
name: CNVM CI
runs-on: ubuntu-22.04
timeout-minutes: 30
timeout-minutes: 15
steps:
- name: Check out the repo
uses: actions/checkout@v4
Expand Down Expand Up @@ -306,7 +307,7 @@ jobs:
timeout-minutes: 60
permissions:
pull-requests: write
if: ${{ success() || failure() }}
if: ${{ always() }}
env:
AWS_REGION: "eu-west-1"
ALLURE_S3_BUCKET: "s3://csp-allure-reports/allure_reports/cloudbeat/ci"
Expand All @@ -316,20 +317,20 @@ jobs:
uses: actions/checkout@v4

- uses: actions/download-artifact@v4
if: ${{ success() || failure() }}
if: ${{ always() }}
with:
pattern: allure-results-ci-*
path: tests/allure/results/
merge-multiple: true

- name: log
if: ${{ success() || failure() }}
if: ${{ always() }}
shell: bash
run: |
ls -lahR tests/allure/results/ || true
- name: Publish allure report
if: ${{ success() || failure() }}
if: ${{ always() }}
uses: andrcuns/allure-publish-action@v2.6.0
env:
GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -377,7 +378,7 @@ jobs:
message: |
${{ env.ALLURE_SUMMARY }}
- if: ${{ always() }}
- if: ${{ success() }}
name: Cleanup docker image artifacts
uses: geekyeggo/delete-artifact@v5
with:
Expand Down

0 comments on commit 84229c2

Please sign in to comment.