Skip to content

Commit

Permalink
revert: Revert gh actions changes (#3709)
Browse files Browse the repository at this point in the history
* Revert "feat: Use workflow call to run integration tests after image build (#3705)"

This reverts commit 9424668.

* Revert "feat: Run dev k3d tests after build (#3686)"

This reverts commit 6d16eea.
  • Loading branch information
dbadura authored Feb 17, 2025
1 parent 9424668 commit 20f2e5b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/busola-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,10 @@ permissions:

jobs:
build-busola-image:
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: https://github.com/kyma-project/test-infra/blob/main/.github/workflows/image-builder.yml
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
if: github.event.pull_request.draft == false
with:
name: busola
dockerfile: Dockerfile
tags: ${{ inputs.tag != '' && inputs.tag || 'latest' }}
build-args: ${{ inputs.tag != '' && format('tag={0}', inputs.tag) || '' }}

run-k3d-integration-tests:
needs: build-busola-image
uses: ./.github/workflows/pull-kyma-integration-tests.yml
with:
pr_number: ${{github.event.number}}
19 changes: 12 additions & 7 deletions .github/workflows/pull-kyma-integration-tests.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: PR Kyma Dashboard Integration Tests Dev

on:
workflow_call:
inputs:
pr_number:
description: "PR number"
required: true
type: string
pull_request:
types: [opened, edited, synchronize, reopened, ready_for_review]
paths:
- '.github/workflows/pull-kyma-intergation-tests.yml'
- 'resources/**'
- 'tests/integration/**'
- 'nginx/**'
- 'src/**'
- 'backend/**'
- 'kyma/**'
- 'Dockerfile*'
jobs:
run-integration-test:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -38,7 +43,7 @@ jobs:
env:
ENV: dev
run: |
.github/scripts/deploy_busola.sh PR-${{ inputs.pr_number }} | tee busola-deploy.log
.github/scripts/deploy_busola.sh PR-${{ github.event.number }} | tee busola-deploy.log
- name: Prepare kubeconfig
run: |
.github/scripts/prepare_kubeconfig.sh
Expand Down

0 comments on commit 20f2e5b

Please sign in to comment.