diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index b33dd52..d19019e 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -1,5 +1,6 @@ name: Push Multiarch Images on: + workflow_dispatch: pull_request: push: branches: @@ -8,7 +9,7 @@ on: jobs: build-and-push-arch-specifics: name: Build Rocks and Push Arch Specific Images - uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@main + uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@KU-1195/fix-for-check-if-container-exist with: owner: ${{ github.repository_owner }} trivy-image-config: "trivy.yaml" @@ -25,7 +26,7 @@ jobs: with: rock-metas: ${{ needs.build-and-push-arch-specifics.outputs.rock-metas }} scan-images: - uses: canonical/k8s-workflows/.github/workflows/scan_images.yaml@main + uses: canonical/k8s-workflows/.github/workflows/scan_images.yaml@KU-1194/added-jira-connection-for-image-scan needs: [build-and-push-arch-specifics] secrets: inherit with: @@ -36,6 +37,7 @@ jobs: name: Combine Rocks and Push Multiarch Manifest uses: canonical/k8s-workflows/.github/workflows/assemble_multiarch_image.yaml@main needs: [build-and-push-arch-specifics] + if: ${{ needs.build-and-push-arch-specifics.outputs.changed-rock-metas != '[]' }} with: - rock-metas: ${{ needs.build-and-push-arch-specifics.outputs.rock-metas }} + rock-metas: ${{ needs.build-and-push-arch-specifics.outputs.changed-rock-metas }} dry-run: ${{ github.event_name != 'push' }} diff --git a/README.md b/README.md index 3e03471..bea299d 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,8 @@ OCI image for [fluent-bit](https://github.com/fluent/fluent-bit) based on Ubuntu Image is loosely based on original [Dockerfile](https://github.com/fluent/fluent-bit/blob/master/dockerfiles/Dockerfile) and [Makefile](https://github.com/fluent/fluent-bit/tree/master/cmake) +# test1 +# test1 +# test1 +# test1 +# test1 diff --git a/tests/integration/test_fluent_bit.py b/tests/integration/test_fluent_bit.py index cd63448..01cf684 100644 --- a/tests/integration/test_fluent_bit.py +++ b/tests/integration/test_fluent_bit.py @@ -6,13 +6,16 @@ import pytest from k8s_test_harness import harness from k8s_test_harness.util import env_util, k8s_util +# from k8s_test_harness.util import constants, env_util, k8s_util -pytest_plugins = ["k8s_test_harness.plugin"] + +# pytest_plugins = ["k8s_test_harness.plugin"] LOG = logging.getLogger(__name__) -@pytest.mark.parametrize("image_version", ("2.1.6", "1.9.5")) +# @pytest.mark.parametrize("image_version", ("2.1.6", "1.9.5")) +@pytest.mark.parametrize("image_version", ["2.1.6"]) def test_integration_fluent_bit( function_instance: harness.Instance, image_version: str ): diff --git a/tests/requirements-test.txt b/tests/requirements-test.txt index ff57d6b..203db3c 100644 --- a/tests/requirements-test.txt +++ b/tests/requirements-test.txt @@ -2,4 +2,4 @@ coverage[toml]==7.2.5 pytest==7.3.1 PyYAML==6.0.1 tenacity==8.2.3 -git+https://github.com/canonical/k8s-test-harness.git@main +git+https://github.com/canonical/k8s-test-harness.git@KU-1234/icrease-get-node-retry diff --git a/tests/tox.ini b/tests/tox.ini index c79ad1f..45cc0a4 100644 --- a/tests/tox.ini +++ b/tests/tox.ini @@ -54,16 +54,16 @@ deps = -r {tox_root}/requirements-test.txt commands = pytest -v \ - --maxfail 1 \ --tb native \ --log-cli-level DEBUG \ --disable-warnings \ {posargs} \ {tox_root}/integration pass_env = + BUILT_ROCKS_METADATA TEST_* ROCK_* - BUILT_ROCKS_METADATA + [flake8] max-line-length = 120