Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workflow test no trigger #9

Closed
wants to merge 20 commits into from
8 changes: 5 additions & 3 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Push Multiarch Images
on:
workflow_dispatch:
pull_request:
push:
branches:
Expand All @@ -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"
Expand All @@ -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:
Expand All @@ -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' }}
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 5 additions & 2 deletions tests/integration/test_fluent_bit.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
):
Expand Down
2 changes: 1 addition & 1 deletion tests/requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions tests/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading