diff --git a/.github/workflows/publish-image-on-push-to-branch.yml b/.github/workflows/publish-image-on-push-to-branch.yml index 8e88580..5cdef56 100644 --- a/.github/workflows/publish-image-on-push-to-branch.yml +++ b/.github/workflows/publish-image-on-push-to-branch.yml @@ -10,7 +10,7 @@ concurrency: cancel-in-progress: true jobs: - build_and_push: + build_and_push_image: permissions: packages: write security-events: write @@ -21,4 +21,4 @@ jobs: run_trivy_scan: true image_tag_generation: "ticket_from_branch" add_latest_tag: false - container_registry: "ghcr.io" + container_registry: "ghcr.io" \ No newline at end of file diff --git a/.github/workflows/publish-image-and-helm-on-tag.yml b/.github/workflows/publish-image-on-tag.yml similarity index 58% rename from .github/workflows/publish-image-and-helm-on-tag.yml rename to .github/workflows/publish-image-on-tag.yml index 53e0760..4cd8cd6 100644 --- a/.github/workflows/publish-image-and-helm-on-tag.yml +++ b/.github/workflows/publish-image-on-tag.yml @@ -21,13 +21,4 @@ jobs: run_trivy_scan: true image_tag_generation: "version_git_tag" add_latest_tag: true - container_registry: "ghcr.io" - publish_helm: - uses: dBildungsplattform/dbp-github-workflows/.github/workflows/chart-release.yaml@5.0.0 - secrets: inherit - with: - chart_name: schulportal-load-tests - helm_chart_version_generation: specified - image_tag_generation: specified - helm_chart_version: ${{ github.ref_name }} - image_tag: ${{ github.ref_name }} + container_registry: "ghcr.io" \ No newline at end of file diff --git a/.github/workflows/trigger-loadtest.yml b/.github/workflows/trigger-loadtest.yml index 590ed46..32dea84 100644 --- a/.github/workflows/trigger-loadtest.yml +++ b/.github/workflows/trigger-loadtest.yml @@ -3,7 +3,6 @@ name: Trigger Loadtest on: workflow_dispatch: -on: push: branch: DBP-1012-setup-loadtest-env