From a68e5c4ec6faed0e242470329d3d2f50756910d2 Mon Sep 17 00:00:00 2001 From: Rafaela Soares Date: Thu, 13 Feb 2025 17:48:43 +0000 Subject: [PATCH 1/5] save CRS when test fails --- ...eready-toolchain-host-operator-master.yaml | 2 +- ...eady-toolchain-member-operator-master.yaml | 2 +- ...toolchain-registration-service-master.yaml | 2 +- ...eready-toolchain-toolchain-e2e-master.yaml | 2 +- ...dy-toolchain-workload-analyzer-master.yaml | 2 +- .../step-registry/codeready-toolchain/OWNERS | 21 +++++++++ .../codeready-toolchain/aws/OWNERS | 21 +++++++++ ...ready-toolchain-aws-workflow.metadata.json | 27 ++++++++++++ .../aws/codeready-toolchain-aws-workflow.yaml | 13 ++++++ .../codeready-toolchain/gather/OWNERS | 21 +++++++++ .../codeready-toolchain-gather-commands.sh | 44 +++++++++++++++++++ ...deready-toolchain-gather-ref.metadata.json | 27 ++++++++++++ .../codeready-toolchain-gather-ref.yaml | 14 ++++++ 13 files changed, 193 insertions(+), 5 deletions(-) create mode 100644 ci-operator/step-registry/codeready-toolchain/OWNERS create mode 100644 ci-operator/step-registry/codeready-toolchain/aws/OWNERS create mode 100644 ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json create mode 100644 ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.yaml create mode 100644 ci-operator/step-registry/codeready-toolchain/gather/OWNERS create mode 100755 ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-commands.sh create mode 100644 ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json create mode 100644 ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.yaml diff --git a/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml b/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml index 92f280994ea80..465ee9bcb3650 100644 --- a/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml +++ b/ci-operator/config/codeready-toolchain/host-operator/codeready-toolchain-host-operator-master.yaml @@ -31,7 +31,7 @@ tests: requests: cpu: "3" memory: 250Mi - workflow: ipi-aws + workflow: codeready-toolchain-aws zz_generated_metadata: branch: master org: codeready-toolchain diff --git a/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml b/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml index d498641925398..b420314eb48d9 100644 --- a/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml +++ b/ci-operator/config/codeready-toolchain/member-operator/codeready-toolchain-member-operator-master.yaml @@ -31,7 +31,7 @@ tests: requests: cpu: "3" memory: 250Mi - workflow: ipi-aws + workflow: codeready-toolchain-aws zz_generated_metadata: branch: master org: codeready-toolchain diff --git a/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml b/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml index b887d6a172ef5..4332023fb4a0c 100644 --- a/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml +++ b/ci-operator/config/codeready-toolchain/registration-service/codeready-toolchain-registration-service-master.yaml @@ -31,7 +31,7 @@ tests: requests: cpu: "3" memory: 250Mi - workflow: ipi-aws + workflow: codeready-toolchain-aws zz_generated_metadata: branch: master org: codeready-toolchain diff --git a/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml b/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml index d7b2a6b8373c8..a828c3f2105ac 100644 --- a/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml +++ b/ci-operator/config/codeready-toolchain/toolchain-e2e/codeready-toolchain-toolchain-e2e-master.yaml @@ -31,7 +31,7 @@ tests: requests: cpu: "3" memory: 250Mi - workflow: ipi-aws + workflow: codeready-toolchain-aws zz_generated_metadata: branch: master org: codeready-toolchain diff --git a/ci-operator/config/codeready-toolchain/workload-analyzer/codeready-toolchain-workload-analyzer-master.yaml b/ci-operator/config/codeready-toolchain/workload-analyzer/codeready-toolchain-workload-analyzer-master.yaml index f9b91ca488c66..349f354542441 100644 --- a/ci-operator/config/codeready-toolchain/workload-analyzer/codeready-toolchain-workload-analyzer-master.yaml +++ b/ci-operator/config/codeready-toolchain/workload-analyzer/codeready-toolchain-workload-analyzer-master.yaml @@ -51,7 +51,7 @@ tests: requests: cpu: "3" memory: 250Mi - workflow: ipi-aws + workflow: codeready-toolchain-aws zz_generated_metadata: branch: master org: codeready-toolchain diff --git a/ci-operator/step-registry/codeready-toolchain/OWNERS b/ci-operator/step-registry/codeready-toolchain/OWNERS new file mode 100644 index 0000000000000..ec550c13e1223 --- /dev/null +++ b/ci-operator/step-registry/codeready-toolchain/OWNERS @@ -0,0 +1,21 @@ +approvers: +- alexeykazakov +- fbm3307 +- matousjobanek +- metlos +- mfrancisc +- rajivnathan +- ranakan19 +- rsoaresd +- xcoulon +options: {} +reviewers: +- alexeykazakov +- fbm3307 +- matousjobanek +- metlos +- mfrancisc +- rajivnathan +- ranakan19 +- rsoaresd +- xcoulon diff --git a/ci-operator/step-registry/codeready-toolchain/aws/OWNERS b/ci-operator/step-registry/codeready-toolchain/aws/OWNERS new file mode 100644 index 0000000000000..ec550c13e1223 --- /dev/null +++ b/ci-operator/step-registry/codeready-toolchain/aws/OWNERS @@ -0,0 +1,21 @@ +approvers: +- alexeykazakov +- fbm3307 +- matousjobanek +- metlos +- mfrancisc +- rajivnathan +- ranakan19 +- rsoaresd +- xcoulon +options: {} +reviewers: +- alexeykazakov +- fbm3307 +- matousjobanek +- metlos +- mfrancisc +- rajivnathan +- ranakan19 +- rsoaresd +- xcoulon diff --git a/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json new file mode 100644 index 0000000000000..952e4b430a4e4 --- /dev/null +++ b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json @@ -0,0 +1,27 @@ +{ + "path": "codeready-toolchain/aws/codeready-toolchain-aws-workflow.yaml", + "owners": { + "approvers": [ + "alexeykazakov", + "fbm3307", + "matousjobanek", + "metlos", + "mfrancisc", + "rajivnathan", + "ranakan19", + "rsoaresd", + "xcoulon" + ], + "reviewers": [ + "alexeykazakov", + "fbm3307", + "matousjobanek", + "metlos", + "mfrancisc", + "rajivnathan", + "ranakan19", + "rsoaresd", + "xcoulon" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.yaml b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.yaml new file mode 100644 index 0000000000000..44094928c1f5b --- /dev/null +++ b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.yaml @@ -0,0 +1,13 @@ +workflow: + as: codeready-toolchain-aws + steps: + allow_best_effort_post_steps: true + pre: + - chain: ipi-aws-pre + post: + - ref: codeready-toolchain-gather + optional_on_success: true + - chain: ipi-aws-post + documentation: |- + This workflow provides is based on /ci-operator/step-registry/ipi/aws/ipi-aws-workflow.yaml. + Additionally, it adds codeready-toolchain-gather which will save the Custom Resources on ARTIFACT dir. \ No newline at end of file diff --git a/ci-operator/step-registry/codeready-toolchain/gather/OWNERS b/ci-operator/step-registry/codeready-toolchain/gather/OWNERS new file mode 100644 index 0000000000000..ec550c13e1223 --- /dev/null +++ b/ci-operator/step-registry/codeready-toolchain/gather/OWNERS @@ -0,0 +1,21 @@ +approvers: +- alexeykazakov +- fbm3307 +- matousjobanek +- metlos +- mfrancisc +- rajivnathan +- ranakan19 +- rsoaresd +- xcoulon +options: {} +reviewers: +- alexeykazakov +- fbm3307 +- matousjobanek +- metlos +- mfrancisc +- rajivnathan +- ranakan19 +- rsoaresd +- xcoulon diff --git a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-commands.sh b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-commands.sh new file mode 100755 index 0000000000000..8361223bae934 --- /dev/null +++ b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-commands.sh @@ -0,0 +1,44 @@ +#!/bin/bash + +# queue function stolen from https://steps.ci.openshift.org/reference/gather-extra ;-) +function queue() { + local TARGET="${1}" + shift + local LIVE + LIVE="$(jobs | wc -l)" + while [[ "${LIVE}" -ge 45 ]]; do + sleep 1 + LIVE="$(jobs | wc -l)" + done + echo "${@}" + if [[ -n "${FILTER:-}" ]]; then + "${@}" | "${FILTER}" >"${TARGET}" & + else + "${@}" >"${TARGET}" & + fi +} + +# Resources +queue ${ARTIFACT_DIR}/bannedusers.json oc --insecure-skip-tls-verify --request-timeout=5s get bannedusers.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/idlers.json oc --insecure-skip-tls-verify --request-timeout=5s get idlers.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/masteruserrecords.json oc --insecure-skip-tls-verify --request-timeout=5s get masteruserrecords.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/memberoperatorconfigs.json oc --insecure-skip-tls-verify --request-timeout=5s get memberoperatorconfigs.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/memberstatuses.json oc --insecure-skip-tls-verify --request-timeout=5s get memberstatuses.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/notifications.json oc --insecure-skip-tls-verify --request-timeout=5s get notifications.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/nstemplatesets.json oc --insecure-skip-tls-verify --request-timeout=5s get nstemplatesets.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/nstemplatetiers.json oc --insecure-skip-tls-verify --request-timeout=5s get nstemplatetiers.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/proxyplugins.json oc --insecure-skip-tls-verify --request-timeout=5s get proxyplugins.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/socialevents.json oc --insecure-skip-tls-verify --request-timeout=5s get socialevents.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/spacebindings.json oc --insecure-skip-tls-verify --request-timeout=5s get spacebindings.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/spacebindingrequests.json oc --insecure-skip-tls-verify --request-timeout=5s get spacebindingrequests.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/spaceprovisionerconfigs.json oc --insecure-skip-tls-verify --request-timeout=5s get spaceprovisionerconfigs.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/spacerequests.json oc --insecure-skip-tls-verify --request-timeout=5s get spacerequests.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/spaces.json oc --insecure-skip-tls-verify --request-timeout=5s get spaces.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/tiertemplates.json oc --insecure-skip-tls-verify --request-timeout=5s get tiertemplates.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/tiertemplaterevisions.json oc --insecure-skip-tls-verify --request-timeout=5s get tiertemplaterevisions.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/toolchainclusters.json oc --insecure-skip-tls-verify --request-timeout=5s get toolchainclusters.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/toolchainconfigs.json oc --insecure-skip-tls-verify --request-timeout=5s get toolchainconfigs.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/toolchainstatuses.json oc --insecure-skip-tls-verify --request-timeout=5s get toolchainstatuses.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/usersignups.json oc --insecure-skip-tls-verify --request-timeout=5s get usersignups.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/usertiers.json oc --insecure-skip-tls-verify --request-timeout=5s get usertiers.toolchain.dev.openshift.com --all-namespaces -o json +queue ${ARTIFACT_DIR}/workspaces.json oc --insecure-skip-tls-verify --request-timeout=5s get workspaces.toolchain.dev.openshift.com --all-namespaces -o json diff --git a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json new file mode 100644 index 0000000000000..0c661f8f25b48 --- /dev/null +++ b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json @@ -0,0 +1,27 @@ +{ + "path": "codeready-toolchain/gather/codeready-toolchain-gather-ref.yaml", + "owners": { + "approvers": [ + "alexeykazakov", + "fbm3307", + "matousjobanek", + "metlos", + "mfrancisc", + "rajivnathan", + "ranakan19", + "rsoaresd", + "xcoulon" + ], + "reviewers": [ + "alexeykazakov", + "fbm3307", + "matousjobanek", + "metlos", + "mfrancisc", + "rajivnathan", + "ranakan19", + "rsoaresd", + "xcoulon" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.yaml b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.yaml new file mode 100644 index 0000000000000..954af452b89ea --- /dev/null +++ b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.yaml @@ -0,0 +1,14 @@ +ref: + as: codeready-toolchain-gather + best_effort: true + optional_on_success: true + from: cli + commands: codeready-toolchain-gather-commands.sh + timeout: 900s + grace_period: 60s + resources: + requests: + cpu: 300m + memory: 300Mi + documentation: |- + The pre-deprovision artifacts step collects codeready-toolchain artifacts which are either not covered by must-gather or gather-extra. From 3c984a4a142ce502d0470561669e07785bc8cbe1 Mon Sep 17 00:00:00 2001 From: Rafaela Soares Date: Fri, 14 Feb 2025 08:52:49 +0000 Subject: [PATCH 2/5] add jrosental to OWNERS --- ci-operator/config/codeready-toolchain/host-operator/OWNERS | 2 ++ .../config/codeready-toolchain/member-operator/OWNERS | 2 ++ .../config/codeready-toolchain/registration-service/OWNERS | 2 ++ ci-operator/config/codeready-toolchain/toolchain-e2e/OWNERS | 2 ++ .../config/codeready-toolchain/workload-analyzer/OWNERS | 5 +++-- ci-operator/jobs/codeready-toolchain/host-operator/OWNERS | 2 ++ ci-operator/jobs/codeready-toolchain/member-operator/OWNERS | 2 ++ .../jobs/codeready-toolchain/registration-service/OWNERS | 2 ++ ci-operator/jobs/codeready-toolchain/toolchain-e2e/OWNERS | 2 ++ .../jobs/codeready-toolchain/workload-analyzer/OWNERS | 5 +++-- ci-operator/step-registry/codeready-toolchain/OWNERS | 2 ++ ci-operator/step-registry/codeready-toolchain/aws/OWNERS | 2 ++ ci-operator/step-registry/codeready-toolchain/gather/OWNERS | 2 ++ 13 files changed, 28 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/codeready-toolchain/host-operator/OWNERS b/ci-operator/config/codeready-toolchain/host-operator/OWNERS index 24556ace54f7a..5d5a3c2517451 100644 --- a/ci-operator/config/codeready-toolchain/host-operator/OWNERS +++ b/ci-operator/config/codeready-toolchain/host-operator/OWNERS @@ -14,6 +14,7 @@ approvers: - ranakan19 - rsoaresd - xcoulon +- jrosental options: {} reviewers: - alexeykazakov @@ -25,3 +26,4 @@ reviewers: - ranakan19 - rsoaresd - xcoulon +- jrosental diff --git a/ci-operator/config/codeready-toolchain/member-operator/OWNERS b/ci-operator/config/codeready-toolchain/member-operator/OWNERS index 4cafe820ef503..7fcea596f56e2 100644 --- a/ci-operator/config/codeready-toolchain/member-operator/OWNERS +++ b/ci-operator/config/codeready-toolchain/member-operator/OWNERS @@ -14,6 +14,7 @@ approvers: - ranakan19 - rsoaresd - xcoulon +- jrosental options: {} reviewers: - alexeykazakov @@ -25,3 +26,4 @@ reviewers: - ranakan19 - rsoaresd - xcoulon +- jrosental diff --git a/ci-operator/config/codeready-toolchain/registration-service/OWNERS b/ci-operator/config/codeready-toolchain/registration-service/OWNERS index 90fc457c4cde2..2f1b1786726a8 100644 --- a/ci-operator/config/codeready-toolchain/registration-service/OWNERS +++ b/ci-operator/config/codeready-toolchain/registration-service/OWNERS @@ -14,6 +14,7 @@ approvers: - ranakan19 - rsoaresd - xcoulon +- jrosental options: {} reviewers: - alexeykazakov @@ -25,3 +26,4 @@ reviewers: - ranakan19 - rsoaresd - xcoulon +- jrosental diff --git a/ci-operator/config/codeready-toolchain/toolchain-e2e/OWNERS b/ci-operator/config/codeready-toolchain/toolchain-e2e/OWNERS index 081a93cb77532..d5b0e203ec042 100644 --- a/ci-operator/config/codeready-toolchain/toolchain-e2e/OWNERS +++ b/ci-operator/config/codeready-toolchain/toolchain-e2e/OWNERS @@ -14,6 +14,7 @@ approvers: - ranakan19 - rsoaresd - xcoulon +- jrosental options: {} reviewers: - alexeykazakov @@ -25,3 +26,4 @@ reviewers: - ranakan19 - rsoaresd - xcoulon +- jrosental diff --git a/ci-operator/config/codeready-toolchain/workload-analyzer/OWNERS b/ci-operator/config/codeready-toolchain/workload-analyzer/OWNERS index ecddfe094118f..a443ec1650ae4 100644 --- a/ci-operator/config/codeready-toolchain/workload-analyzer/OWNERS +++ b/ci-operator/config/codeready-toolchain/workload-analyzer/OWNERS @@ -14,7 +14,7 @@ approvers: - fbm3307 - metlos - rsoaresd - +- jrosental options: {} reviewers: - alexeykazakov @@ -25,4 +25,5 @@ reviewers: - xcoulon - fbm3307 - metlos -- rsoaresd \ No newline at end of file +- rsoaresd +- jrosental \ No newline at end of file diff --git a/ci-operator/jobs/codeready-toolchain/host-operator/OWNERS b/ci-operator/jobs/codeready-toolchain/host-operator/OWNERS index 24556ace54f7a..5d5a3c2517451 100644 --- a/ci-operator/jobs/codeready-toolchain/host-operator/OWNERS +++ b/ci-operator/jobs/codeready-toolchain/host-operator/OWNERS @@ -14,6 +14,7 @@ approvers: - ranakan19 - rsoaresd - xcoulon +- jrosental options: {} reviewers: - alexeykazakov @@ -25,3 +26,4 @@ reviewers: - ranakan19 - rsoaresd - xcoulon +- jrosental diff --git a/ci-operator/jobs/codeready-toolchain/member-operator/OWNERS b/ci-operator/jobs/codeready-toolchain/member-operator/OWNERS index 4cafe820ef503..7fcea596f56e2 100644 --- a/ci-operator/jobs/codeready-toolchain/member-operator/OWNERS +++ b/ci-operator/jobs/codeready-toolchain/member-operator/OWNERS @@ -14,6 +14,7 @@ approvers: - ranakan19 - rsoaresd - xcoulon +- jrosental options: {} reviewers: - alexeykazakov @@ -25,3 +26,4 @@ reviewers: - ranakan19 - rsoaresd - xcoulon +- jrosental diff --git a/ci-operator/jobs/codeready-toolchain/registration-service/OWNERS b/ci-operator/jobs/codeready-toolchain/registration-service/OWNERS index 90fc457c4cde2..2f1b1786726a8 100644 --- a/ci-operator/jobs/codeready-toolchain/registration-service/OWNERS +++ b/ci-operator/jobs/codeready-toolchain/registration-service/OWNERS @@ -14,6 +14,7 @@ approvers: - ranakan19 - rsoaresd - xcoulon +- jrosental options: {} reviewers: - alexeykazakov @@ -25,3 +26,4 @@ reviewers: - ranakan19 - rsoaresd - xcoulon +- jrosental diff --git a/ci-operator/jobs/codeready-toolchain/toolchain-e2e/OWNERS b/ci-operator/jobs/codeready-toolchain/toolchain-e2e/OWNERS index 081a93cb77532..d5b0e203ec042 100644 --- a/ci-operator/jobs/codeready-toolchain/toolchain-e2e/OWNERS +++ b/ci-operator/jobs/codeready-toolchain/toolchain-e2e/OWNERS @@ -14,6 +14,7 @@ approvers: - ranakan19 - rsoaresd - xcoulon +- jrosental options: {} reviewers: - alexeykazakov @@ -25,3 +26,4 @@ reviewers: - ranakan19 - rsoaresd - xcoulon +- jrosental diff --git a/ci-operator/jobs/codeready-toolchain/workload-analyzer/OWNERS b/ci-operator/jobs/codeready-toolchain/workload-analyzer/OWNERS index aae04331b1b8c..f445615e0c14f 100644 --- a/ci-operator/jobs/codeready-toolchain/workload-analyzer/OWNERS +++ b/ci-operator/jobs/codeready-toolchain/workload-analyzer/OWNERS @@ -14,7 +14,7 @@ approvers: - fbm3307 - metlos - rsoaresd - +- jrosental options: {} reviewers: - alexeykazakov @@ -25,4 +25,5 @@ reviewers: - xcoulon - fbm3307 - metlos -- rsoaresd \ No newline at end of file +- rsoaresd +- jrosental \ No newline at end of file diff --git a/ci-operator/step-registry/codeready-toolchain/OWNERS b/ci-operator/step-registry/codeready-toolchain/OWNERS index ec550c13e1223..a8003660698e1 100644 --- a/ci-operator/step-registry/codeready-toolchain/OWNERS +++ b/ci-operator/step-registry/codeready-toolchain/OWNERS @@ -8,6 +8,7 @@ approvers: - ranakan19 - rsoaresd - xcoulon +- jrosental options: {} reviewers: - alexeykazakov @@ -19,3 +20,4 @@ reviewers: - ranakan19 - rsoaresd - xcoulon +- jrosental diff --git a/ci-operator/step-registry/codeready-toolchain/aws/OWNERS b/ci-operator/step-registry/codeready-toolchain/aws/OWNERS index ec550c13e1223..a8003660698e1 100644 --- a/ci-operator/step-registry/codeready-toolchain/aws/OWNERS +++ b/ci-operator/step-registry/codeready-toolchain/aws/OWNERS @@ -8,6 +8,7 @@ approvers: - ranakan19 - rsoaresd - xcoulon +- jrosental options: {} reviewers: - alexeykazakov @@ -19,3 +20,4 @@ reviewers: - ranakan19 - rsoaresd - xcoulon +- jrosental diff --git a/ci-operator/step-registry/codeready-toolchain/gather/OWNERS b/ci-operator/step-registry/codeready-toolchain/gather/OWNERS index ec550c13e1223..a8003660698e1 100644 --- a/ci-operator/step-registry/codeready-toolchain/gather/OWNERS +++ b/ci-operator/step-registry/codeready-toolchain/gather/OWNERS @@ -8,6 +8,7 @@ approvers: - ranakan19 - rsoaresd - xcoulon +- jrosental options: {} reviewers: - alexeykazakov @@ -19,3 +20,4 @@ reviewers: - ranakan19 - rsoaresd - xcoulon +- jrosental From 2dc90e3b55e18977dc4cb7e02f005f352db6d386 Mon Sep 17 00:00:00 2001 From: Rafaela Soares Date: Fri, 14 Feb 2025 09:40:22 +0000 Subject: [PATCH 3/5] requested changes --- .../codeready-toolchain-gather-commands.sh | 27 +++---------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-commands.sh b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-commands.sh index 8361223bae934..eec3f23918ca4 100755 --- a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-commands.sh +++ b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-commands.sh @@ -19,26 +19,7 @@ function queue() { } # Resources -queue ${ARTIFACT_DIR}/bannedusers.json oc --insecure-skip-tls-verify --request-timeout=5s get bannedusers.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/idlers.json oc --insecure-skip-tls-verify --request-timeout=5s get idlers.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/masteruserrecords.json oc --insecure-skip-tls-verify --request-timeout=5s get masteruserrecords.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/memberoperatorconfigs.json oc --insecure-skip-tls-verify --request-timeout=5s get memberoperatorconfigs.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/memberstatuses.json oc --insecure-skip-tls-verify --request-timeout=5s get memberstatuses.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/notifications.json oc --insecure-skip-tls-verify --request-timeout=5s get notifications.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/nstemplatesets.json oc --insecure-skip-tls-verify --request-timeout=5s get nstemplatesets.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/nstemplatetiers.json oc --insecure-skip-tls-verify --request-timeout=5s get nstemplatetiers.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/proxyplugins.json oc --insecure-skip-tls-verify --request-timeout=5s get proxyplugins.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/socialevents.json oc --insecure-skip-tls-verify --request-timeout=5s get socialevents.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/spacebindings.json oc --insecure-skip-tls-verify --request-timeout=5s get spacebindings.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/spacebindingrequests.json oc --insecure-skip-tls-verify --request-timeout=5s get spacebindingrequests.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/spaceprovisionerconfigs.json oc --insecure-skip-tls-verify --request-timeout=5s get spaceprovisionerconfigs.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/spacerequests.json oc --insecure-skip-tls-verify --request-timeout=5s get spacerequests.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/spaces.json oc --insecure-skip-tls-verify --request-timeout=5s get spaces.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/tiertemplates.json oc --insecure-skip-tls-verify --request-timeout=5s get tiertemplates.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/tiertemplaterevisions.json oc --insecure-skip-tls-verify --request-timeout=5s get tiertemplaterevisions.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/toolchainclusters.json oc --insecure-skip-tls-verify --request-timeout=5s get toolchainclusters.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/toolchainconfigs.json oc --insecure-skip-tls-verify --request-timeout=5s get toolchainconfigs.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/toolchainstatuses.json oc --insecure-skip-tls-verify --request-timeout=5s get toolchainstatuses.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/usersignups.json oc --insecure-skip-tls-verify --request-timeout=5s get usersignups.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/usertiers.json oc --insecure-skip-tls-verify --request-timeout=5s get usertiers.toolchain.dev.openshift.com --all-namespaces -o json -queue ${ARTIFACT_DIR}/workspaces.json oc --insecure-skip-tls-verify --request-timeout=5s get workspaces.toolchain.dev.openshift.com --all-namespaces -o json +CRD_LIST=$(oc get crds -o jsonpath='{.items[?(@.spec.group=="toolchain.dev.openshift.com")].metadata.name}') +for CRD in ${CRD_LIST}; do + queue ${ARTIFACT_DIR}/${CRD}.json oc --insecure-skip-tls-verify --request-timeout=5s get ${CRD} --all-namespaces -o json +done \ No newline at end of file From ee8480ff26e820573d94c7cf6e209720e8c59369 Mon Sep 17 00:00:00 2001 From: Rafaela Soares Date: Tue, 25 Feb 2025 09:30:04 +0000 Subject: [PATCH 4/5] fix --- .../aws/codeready-toolchain-aws-workflow.metadata.json | 8 +++++--- .../gather/codeready-toolchain-gather-ref.metadata.json | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json index 952e4b430a4e4..968a927cf4d15 100644 --- a/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json +++ b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json @@ -10,7 +10,8 @@ "rajivnathan", "ranakan19", "rsoaresd", - "xcoulon" + "xcoulon", + "jrosental" ], "reviewers": [ "alexeykazakov", @@ -21,7 +22,8 @@ "rajivnathan", "ranakan19", "rsoaresd", - "xcoulon" + "xcoulon", + "jrosental" ] } -} \ No newline at end of file +} diff --git a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json index 0c661f8f25b48..e9a0e7fc12919 100644 --- a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json +++ b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json @@ -10,7 +10,8 @@ "rajivnathan", "ranakan19", "rsoaresd", - "xcoulon" + "xcoulon", + "jrosental" ], "reviewers": [ "alexeykazakov", @@ -21,7 +22,8 @@ "rajivnathan", "ranakan19", "rsoaresd", - "xcoulon" + "xcoulon", + "jrosental" ] } -} \ No newline at end of file +} From 67ece3f089741d07aa9c9a3c5f6a29b4bb3eb30d Mon Sep 17 00:00:00 2001 From: Rafaela Soares Date: Tue, 25 Feb 2025 10:04:31 +0000 Subject: [PATCH 5/5] fix --- .../aws/codeready-toolchain-aws-workflow.metadata.json | 2 +- .../gather/codeready-toolchain-gather-ref.metadata.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json index 968a927cf4d15..6ac59d417615a 100644 --- a/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json +++ b/ci-operator/step-registry/codeready-toolchain/aws/codeready-toolchain-aws-workflow.metadata.json @@ -26,4 +26,4 @@ "jrosental" ] } -} +} \ No newline at end of file diff --git a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json index e9a0e7fc12919..ddc4f9d818ee6 100644 --- a/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json +++ b/ci-operator/step-registry/codeready-toolchain/gather/codeready-toolchain-gather-ref.metadata.json @@ -26,4 +26,4 @@ "jrosental" ] } -} +} \ No newline at end of file