Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
Signed-off-by: Wainer dos Santos Moschetta <[email protected]>
  • Loading branch information
wainersm committed Dec 4, 2023
1 parent f56d3af commit 8e6b5fc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/e2e_on_pull.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,14 @@ on:
- 'main'

jobs:
authorize:
runs-on: ubuntu-latest
if: contains(github.event.pull_request.labels.*.name, 'test_e2e_libvirt')
steps:
- run: "true"
e2e:
uses: ./.github/workflows/e2e_run_all.yaml
needs: [authorize]
with:
caa_image_tag: ci-pr${{ github.event.number }}
git_ref: ${{ github.event.pull_request.head.sha }}
Expand Down
18 changes: 2 additions & 16 deletions .github/workflows/e2e_run_all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ name: (Callable) Run all e2e tests
on:
workflow_call:
inputs:
authorized:
default: false
description: Pre-authorize the workflow execution
required: false
type: boolean
caa_image_tag:
description: set the cloud-api-adaptor image tag
required: true
Expand All @@ -39,18 +34,9 @@ env:
E2E_IMG_DEV_TAG: ${{ inputs.caa_image_tag }}-dev

jobs:
authorize:
runs-on: ubuntu-latest
if: |
inputs.authorized == true ||
contains(github.event.pull_request.labels.*.name, 'test_e2e_libvirt')
steps:
- run: "true"

# Build the podvm images.
#
podvm_builder:
needs: [authorize]
uses: ./.github/workflows/podvm_builder.yaml
with:
registry: ${{ inputs.registry }}
Expand Down Expand Up @@ -91,7 +77,6 @@ jobs:
#
image:
uses: ./.github/workflows/caa_build_and_push.yaml
needs: [authorize]
with:
registry: ${{ inputs.registry }}
dev_tags: ${{ inputs.caa_image_tag }}-dev
Expand Down Expand Up @@ -157,7 +142,8 @@ jobs:
libvirt:
name: libvirt
if: |
inputs.authorized == true ||
github.event_name == 'scheduled' ||
github.event_name == 'workflow_dispatch' ||
contains(github.event.pull_request.labels.*.name, 'test_e2e_libvirt')
needs: [podvm, image, prep_install]
strategy:
Expand Down

0 comments on commit 8e6b5fc

Please sign in to comment.