From ac894ab84f3a837a0386b4ceb13bf87bf4414205 Mon Sep 17 00:00:00 2001 From: Katka92 Date: Mon, 18 Nov 2024 15:08:54 +0100 Subject: [PATCH 1/3] fix(test): add coverage for main branch to enable codecov to count a diff --- .github/workflows/post-merge.yaml | 45 +++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/post-merge.yaml diff --git a/.github/workflows/post-merge.yaml b/.github/workflows/post-merge.yaml new file mode 100644 index 00000000..bdb6c9b8 --- /dev/null +++ b/.github/workflows/post-merge.yaml @@ -0,0 +1,45 @@ +name: Push Coverage Post Merge + +# Controls when the action will run. +on: + # Triggers the workflow on pull request events but only for the main branch + push: + branches: + - main + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "test" + test: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [20.x] # can support multiple versions ex: [18.x, 20.x] + + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - name: Checkout ๐Ÿ›Ž๏ธ + uses: actions/checkout@v4 + - name: Setup โš™๏ธ Node.js ${{ matrix.node-version }} ๐Ÿ”ฐ + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + cache: 'yarn' + + - name: Install Dependencies ๐Ÿฅ + run: yarn install --frozen-lockfile + + - name: Run unit tests ๐Ÿงช + run: yarn coverage --silent --ci --verbose=false + env: + CI: true + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v4 + with: + file: ./coverage/lcov.info + token: ${{ secrets.CODECOV_TOKEN }} + flags: unittests + fail_ci_if_error: true From 39a21695b55617d37de79ba84eebcd9cf0d0cfbf Mon Sep 17 00:00:00 2001 From: Gal Ben Haim Date: Wed, 20 Nov 2024 20:59:38 +0200 Subject: [PATCH 2/3] chore: remove unsupported task sbom-json-check remove unsupported task sbom-json-check Signed-off-by: Gal Ben Haim --- .tekton/konflux-ui-pull-request.yaml | 22 ---------------------- .tekton/konflux-ui-push.yaml | 22 ---------------------- 2 files changed, 44 deletions(-) diff --git a/.tekton/konflux-ui-pull-request.yaml b/.tekton/konflux-ui-pull-request.yaml index 7ff65ad2..2def5567 100644 --- a/.tekton/konflux-ui-pull-request.yaml +++ b/.tekton/konflux-ui-pull-request.yaml @@ -390,28 +390,6 @@ spec: operator: in values: - "false" - - name: sbom-json-check - params: - - name: IMAGE_URL - value: $(tasks.build-container.results.IMAGE_URL) - - name: IMAGE_DIGEST - value: $(tasks.build-container.results.IMAGE_DIGEST) - runAfter: - - build-container - taskRef: - params: - - name: name - value: sbom-json-check - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.2@sha256:f3f441de3002c5654acdff0553fd54cb1409e6bef6ff68e514d1731c9688b5cc - - name: kind - value: task - resolver: bundles - when: - - input: $(params.skip-checks) - operator: in - values: - - "false" - name: apply-tags params: - name: IMAGE diff --git a/.tekton/konflux-ui-push.yaml b/.tekton/konflux-ui-push.yaml index 1c32099d..56669f95 100644 --- a/.tekton/konflux-ui-push.yaml +++ b/.tekton/konflux-ui-push.yaml @@ -387,28 +387,6 @@ spec: operator: in values: - "false" - - name: sbom-json-check - params: - - name: IMAGE_URL - value: $(tasks.build-container.results.IMAGE_URL) - - name: IMAGE_DIGEST - value: $(tasks.build-container.results.IMAGE_DIGEST) - runAfter: - - build-container - taskRef: - params: - - name: name - value: sbom-json-check - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.2@sha256:f3f441de3002c5654acdff0553fd54cb1409e6bef6ff68e514d1731c9688b5cc - - name: kind - value: task - resolver: bundles - when: - - input: $(params.skip-checks) - operator: in - values: - - "false" - name: apply-tags params: - name: IMAGE From 4a5f47b8dcc6ec57aca837e7fe65a7a07ad1c2d7 Mon Sep 17 00:00:00 2001 From: Gal Ben Haim Date: Wed, 20 Nov 2024 21:03:36 +0200 Subject: [PATCH 3/3] chore: add rpms-signature-scan add rpms-signature-scan Signed-off-by: Gal Ben Haim --- .tekton/konflux-ui-pull-request.yaml | 17 +++++++++++++++++ .tekton/konflux-ui-push.yaml | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/.tekton/konflux-ui-pull-request.yaml b/.tekton/konflux-ui-pull-request.yaml index 2def5567..d92facc9 100644 --- a/.tekton/konflux-ui-pull-request.yaml +++ b/.tekton/konflux-ui-pull-request.yaml @@ -405,6 +405,23 @@ spec: - name: kind value: task resolver: bundles + - name: rpms-signature-scan + params: + - name: image-digest + value: $(tasks.build-container.results.IMAGE_DIGEST) + - name: image-url + value: $(tasks.build-container.results.IMAGE_URL) + runAfter: + - build-container + taskRef: + params: + - name: name + value: rpms-signature-scan + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:7aa4d3c95e2b963e82fdda392f7cb3d61e3dab035416cf4a3a34e43cf3c9c9b8 + - name: kind + value: task + resolver: bundles - name: push-dockerfile params: - name: IMAGE diff --git a/.tekton/konflux-ui-push.yaml b/.tekton/konflux-ui-push.yaml index 56669f95..9cde796d 100644 --- a/.tekton/konflux-ui-push.yaml +++ b/.tekton/konflux-ui-push.yaml @@ -402,6 +402,23 @@ spec: - name: kind value: task resolver: bundles + - name: rpms-signature-scan + params: + - name: image-digest + value: $(tasks.build-container.results.IMAGE_DIGEST) + - name: image-url + value: $(tasks.build-container.results.IMAGE_URL) + runAfter: + - build-container + taskRef: + params: + - name: name + value: rpms-signature-scan + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:7aa4d3c95e2b963e82fdda392f7cb3d61e3dab035416cf4a3a34e43cf3c9c9b8 + - name: kind + value: task + resolver: bundles - name: push-dockerfile params: - name: IMAGE