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.

Sign up for GitHub

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

feat(RELEASE-1329): create-advisory pipeline is called via git resolver #796

Merged
merged 1 commit into from
Jan 30, 2025
Merged

feat(RELEASE-1329): create-advisory pipeline is called via git resolver #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion internal/resources/create-advisory.yaml
View file
Open in desktop

This file was deleted.

0 internal/pipelines/create-advisory/README.md → pipelines/internal/create-advisory/README.md
View file
Open in desktop
File renamed without changes.
0 ...ines/create-advisory/create-advisory.yaml → ...rnal/create-advisory/create-advisory.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions tasks/managed/create-advisory/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ Only all `redhat-pending` or all `redhat-prod` repositories may be specified in

## Changes in 5.0.0
* Added taskGiturl and taskGitRevision parameters to be passed to the internalRequest
* The pipeline is called via git resolver now instead of cluster resolver
* This was done by changing from `-r` to `--pipeline` in the `internal-request` call
* The base image was updated to include this new functionality
* Updated logic to determine InternalRequest name more reliably

## Changes in 4.4.3
* Pass the errata service account secret name to the InternalRequest based on stage or prod
Expand Down
6 changes: 3 additions & 3 deletions tasks/managed/create-advisory/create-advisory.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
description: The advisory url if one was created
steps:
- name: run-script
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/bin/bash
set -ex
Expand Down Expand Up @@ -165,7 +165,7 @@ spec:
fi

echo "Creating InternalRequest to create advisory..."
internal-request -r "$(params.request)" \
internal-request --pipeline "$(params.request)" \
-p application="${application}" \
-p origin="${origin}" \
-p advisory_json="${advisoryData}" \
Expand All @@ -179,7 +179,7 @@ spec:
> "$(workspaces.data.path)"/ir-result.txt || \
(grep "^\[" "$(workspaces.data.path)"/ir-result.txt | jq . && exit 1)

internalRequest=$(awk 'NR==1{ print $2 }' "$(workspaces.data.path)"/ir-result.txt | xargs)
internalRequest=$(awk -F"'" '/created/ { print $2 }' "$(workspaces.data.path)"/ir-result.txt)
echo "done (${internalRequest})"

echo -n "" > "$(results.advisory_url.path)"
Expand Down
15 changes: 8 additions & 7 deletions tasks/managed/create-advisory/tests/test-create-advisory-default-type.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env bash
set -eux
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:
- name: data
steps:
- name: check-result
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env bash
set -ex
Expand All @@ -142,9 +142,10 @@ spec:

internalRequest=$(kubectl get InternalRequest -o json | jq -r '.items[0]')

# Check the request field
if [ "$(echo "$internalRequest" | jq -r '.spec.request' )" != "create-advisory" ]; then
echo "InternalRequest doesn't contain 'create-advisory' in 'request' field"
# Check if the 'pipelineRef' field contains the 'create-advisory' pipeline
if [[ "$(echo "$internalRequest" | jq -r '.spec.pipeline.pipelineRef.params[2].value' )" != \
"pipelines/internal/create-advisory"* ]]; then
echo "InternalRequest doesn't contain 'create-advisory' in 'pipeline' field"
exit 1
fi

Expand Down Expand Up @@ -172,9 +173,9 @@ spec:
taskSpec:
steps:
- name: delete-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

kubectl delete internalrequests --all
4 changes: 2 additions & 2 deletions tasks/managed/create-advisory/tests/test-create-advisory-fail-both-prod-and-pending.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

mkdir "$(workspaces.data.path)"/results
Expand Down
4 changes: 2 additions & 2 deletions tasks/managed/create-advisory/tests/test-create-advisory-fail-no-data.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

mkdir $(workspaces.data.path)/results
Expand Down
2 changes: 1 addition & 1 deletion tasks/managed/create-advisory/tests/test-create-advisory-fail-no-prod-or-pending.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env bash
set -eux
Expand Down
4 changes: 2 additions & 2 deletions tasks/managed/create-advisory/tests/test-create-advisory-fail-no-rpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

mkdir "$(workspaces.data.path)/results"
Expand Down
4 changes: 2 additions & 2 deletions tasks/managed/create-advisory/tests/test-create-advisory-fail-no-snapshot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

mkdir "$(workspaces.data.path)"/results
Expand Down
4 changes: 2 additions & 2 deletions tasks/managed/create-advisory/tests/test-create-advisory-fail-orphan.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

mkdir $(workspaces.data.path)/results
Expand Down
2 changes: 1 addition & 1 deletion tasks/managed/create-advisory/tests/test-create-advisory-fail-rhsa-no-cve.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env bash
set -eux
Expand Down
4 changes: 2 additions & 2 deletions tasks/managed/create-advisory/tests/test-create-advisory-fail-wrong-type.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

mkdir $(workspaces.data.path)/results
Expand Down
17 changes: 9 additions & 8 deletions tasks/managed/create-advisory/tests/test-create-advisory-overwrite-type.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env bash
set -eux
Expand Down Expand Up @@ -136,7 +136,7 @@ spec:
- name: data
steps:
- name: check-result
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env bash
set -ex
Expand All @@ -152,10 +152,11 @@ spec:

internalRequest=$(kubectl get InternalRequest -o json | jq -r '.items[0]')

# Check the request field
if [ "$(echo "$internalRequest" | jq -r '.spec.request' )" != "create-advisory" ]; then
echo "InternalRequest doesn't contain 'create-advisory' in 'request' field"
exit 1
# Check if the 'pipelineRef' field contains the 'create-advisory' pipeline
if [[ "$(echo "$internalRequest" | jq -r '.spec.pipeline.pipelineRef.params[2].value' )" != \
"pipelines/internal/create-advisory"* ]]; then
echo "InternalRequest doesn't contain 'create-advisory' in 'pipeline' field"
exit 1
fi

# Check the advisory_json parameter
Expand All @@ -182,9 +183,9 @@ spec:
taskSpec:
steps:
- name: delete-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

kubectl delete internalrequests --all
21 changes: 11 additions & 10 deletions tasks/managed/create-advisory/tests/test-create-advisory-pending-repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

mkdir $(workspaces.data.path)/results
Expand Down Expand Up @@ -124,9 +124,9 @@ spec:
- name: data
steps:
- name: check-result
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/bin/sh
#!/bin/bash
set -ex

# Count the number of InternalRequests
Expand All @@ -140,10 +140,11 @@ spec:

internalRequest=$(kubectl get InternalRequest -o json | jq -r '.items[0]')

# Check the request field
if [ "$(echo "$internalRequest" | jq -r '.spec.request' )" != "create-advisory" ]; then
echo "InternalRequest doesn't contain 'create-advisory' in 'request' field"
exit 1
# Check if the 'pipelineRef' field contains the 'create-advisory' pipeline
if [[ "$(echo "$internalRequest" | jq -r '.spec.pipeline.pipelineRef.params[2].value' )" != \
"pipelines/internal/create-advisory"* ]]; then
echo "InternalRequest doesn't contain 'create-advisory' in 'pipeline' field"
exit 1
fi

# Check the application parameter
Expand Down Expand Up @@ -195,9 +196,9 @@ spec:
taskSpec:
steps:
- name: delete-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

kubectl delete internalrequests --all
21 changes: 11 additions & 10 deletions tasks/managed/create-advisory/tests/test-create-advisory-prod-repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ spec:
taskSpec:
steps:
- name: create-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

mkdir $(workspaces.data.path)/results
Expand Down Expand Up @@ -126,9 +126,9 @@ spec:
- name: data
steps:
- name: check-result
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/bin/sh
#!/bin/bash
set -ex

# Count the number of InternalRequests
Expand All @@ -142,10 +142,11 @@ spec:

internalRequest=$(kubectl get InternalRequest -o json | jq -r '.items[0]')

# Check the request field
if [ "$(echo "$internalRequest" | jq -r '.spec.request' )" != "create-advisory" ]; then
echo "InternalRequest doesn't contain 'create-advisory' in 'request' field"
exit 1
# Check if the 'pipelineRef' field contains the 'create-advisory' pipeline
if [[ "$(echo "$internalRequest" | jq -r '.spec.pipeline.pipelineRef.params[2].value' )" != \
"pipelines/internal/create-advisory"* ]]; then
echo "InternalRequest doesn't contain 'create-advisory' in 'pipeline' field"
exit 1
fi

# Check the application parameter
Expand Down Expand Up @@ -210,9 +211,9 @@ spec:
taskSpec:
steps:
- name: delete-crs
image: quay.io/konflux-ci/release-service-utils:e633d51cd41d73e4b3310face21bb980af7a662f
image: quay.io/konflux-ci/release-service-utils:0f82be4be43294b6a96846d87ef7f7c0b9e34267
script: |
#!/usr/bin/env sh
#!/usr/bin/env bash
set -eux

kubectl delete internalrequests --all