From 09dbf2387a0558973fd2d0c17ff1a7931dcd5921 Mon Sep 17 00:00:00 2001 From: Marco Braga Date: Sat, 28 Dec 2024 02:26:21 -0300 Subject: [PATCH] OPCT-000: rename to opct from codebase --- Makefile | 2 +- cmd/opct/root.go | 16 ++++++++-------- data/data_test.go | 2 +- .../plugins/openshift-artifacts-collector.yaml | 2 +- .../plugins/openshift-cluster-upgrade.yaml | 2 +- .../plugins/openshift-conformance-replay.yaml | 2 +- .../plugins/openshift-conformance-validated.yaml | 2 +- .../plugins/openshift-kube-conformance.yaml | 2 +- data/templates/report/report.html | 4 ++-- docs/home_opct.apps/index.html | 2 +- docs/support-guide.md | 2 +- go.mod | 2 +- hack/Containerfile | 4 ++-- hack/generate-changelog.sh | 10 +++++----- hack/go-imports.sh | 4 ++-- hack/go-staticcheck.sh | 4 ++-- internal/opct/archive/metaconfig_test.go | 2 +- internal/opct/archive/metalog_test.go | 2 +- internal/opct/archive/opctconfigmap_test.go | 2 +- internal/opct/plugin/plugin.go | 2 +- internal/opct/plugin/test.go | 4 ++-- internal/opct/summary/consolidated.go | 8 ++++---- internal/opct/summary/openshift.go | 2 +- internal/opct/summary/result.go | 8 ++++---- internal/opct/summary/sonobuoy.go | 2 +- internal/openshift/mustgather/etcd.go | 2 +- internal/openshift/mustgather/log.go | 2 +- internal/openshift/mustgather/mustgather.go | 2 +- internal/report/data.go | 12 ++++++------ internal/report/slo.go | 6 +++--- main.go | 4 ++-- pkg/cmd/adm/baseline/get.go | 4 ++-- pkg/cmd/adm/baseline/indexer.go | 2 +- pkg/cmd/adm/baseline/list.go | 2 +- pkg/cmd/adm/baseline/publish.go | 8 ++++---- pkg/cmd/adm/parseetcdlogs.go | 4 ++-- pkg/cmd/adm/parsemetrics.go | 2 +- pkg/cmd/adm/root.go | 2 +- pkg/cmd/adm/setupNode.go | 2 +- pkg/cmd/get/images.go | 2 +- pkg/cmd/report/report.go | 8 ++++---- pkg/destroy/destroy.go | 4 ++-- pkg/retrieve/retrieve.go | 4 ++-- pkg/run/manifests.go | 2 +- pkg/run/run.go | 14 +++++++------- pkg/status/cmd.go | 2 +- pkg/status/printer.go | 2 +- pkg/status/status.go | 4 ++-- pkg/version/version.go | 2 +- pkg/wait/util.go | 2 +- test/manifests_test.go | 4 ++-- test/testdata/plugins/sample-v0-ok.yaml | 2 +- test/testdata/plugins/sample-v1-fail.yaml | 2 +- test/testdata/templates/plugins/sample.yaml | 2 +- 54 files changed, 102 insertions(+), 102 deletions(-) diff --git a/Makefile b/Makefile index ba530052..ca9eb584 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ VERSION=$(shell git rev-parse --short HEAD) RELEASE_TAG ?= 0.0.0 BIN_NAME ?= opct -GO_BUILD_FLAGS := -ldflags '-s -w -X github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/version.commit=$(VERSION) -X github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/version.version=$(RELEASE_TAG)' +GO_BUILD_FLAGS := -ldflags '-s -w -X github.com/redhat-openshift-ecosystem/opct/pkg/version.commit=$(VERSION) -X github.com/redhat-openshift-ecosystem/opct/pkg/version.version=$(RELEASE_TAG)' GOOS ?= linux GOARCH ?= amd64 diff --git a/cmd/opct/root.go b/cmd/opct/root.go index a235ed8a..b6dae569 100644 --- a/cmd/opct/root.go +++ b/cmd/opct/root.go @@ -11,14 +11,14 @@ import ( "github.com/spf13/viper" "github.com/vmware-tanzu/sonobuoy/cmd/sonobuoy/app" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/cmd/adm" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/cmd/get" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/cmd/report" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/destroy" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/retrieve" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/run" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/status" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/version" + "github.com/redhat-openshift-ecosystem/opct/pkg/cmd/adm" + "github.com/redhat-openshift-ecosystem/opct/pkg/cmd/get" + "github.com/redhat-openshift-ecosystem/opct/pkg/cmd/report" + "github.com/redhat-openshift-ecosystem/opct/pkg/destroy" + "github.com/redhat-openshift-ecosystem/opct/pkg/retrieve" + "github.com/redhat-openshift-ecosystem/opct/pkg/run" + "github.com/redhat-openshift-ecosystem/opct/pkg/status" + "github.com/redhat-openshift-ecosystem/opct/pkg/version" ) const logFile = "opct.log" diff --git a/data/data_test.go b/data/data_test.go index 9a73490f..40f5155f 100644 --- a/data/data_test.go +++ b/data/data_test.go @@ -4,7 +4,7 @@ import ( "embed" "testing" - efs "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/assets" + efs "github.com/redhat-openshift-ecosystem/opct/internal/assets" "github.com/stretchr/testify/assert" ) diff --git a/data/templates/plugins/openshift-artifacts-collector.yaml b/data/templates/plugins/openshift-artifacts-collector.yaml index bea16184..b0d708a9 100644 --- a/data/templates/plugins/openshift-artifacts-collector.yaml +++ b/data/templates/plugins/openshift-artifacts-collector.yaml @@ -14,7 +14,7 @@ sonobuoy-config: OPCT artifacts plugin collects the artifacts from the OpenShift Container Platform post-validation. source-url: - "https://github.com/redhat-openshift-ecosystem/provider-certification-tool/\ + "https://github.com/redhat-openshift-ecosystem/opct/\ blob/main/manifests/openshift-artifacts-collector.yaml" skipCleanup: true spec: diff --git a/data/templates/plugins/openshift-cluster-upgrade.yaml b/data/templates/plugins/openshift-cluster-upgrade.yaml index ca272ec0..bb2f483d 100644 --- a/data/templates/plugins/openshift-cluster-upgrade.yaml +++ b/data/templates/plugins/openshift-cluster-upgrade.yaml @@ -65,7 +65,7 @@ sonobuoy-config: The end-to-end tests maintained by OpenShift to validate provider running the OpenShift Container Platform. source-url: - "https://github.com/redhat-openshift-ecosystem/provider-certification-tool/\ + "https://github.com/redhat-openshift-ecosystem/opct/\ blob/main/manifests/openshift-conformance-validated.yaml" skipCleanup: true spec: diff --git a/data/templates/plugins/openshift-conformance-replay.yaml b/data/templates/plugins/openshift-conformance-replay.yaml index 0543f645..c12eee7b 100644 --- a/data/templates/plugins/openshift-conformance-replay.yaml +++ b/data/templates/plugins/openshift-conformance-replay.yaml @@ -65,7 +65,7 @@ sonobuoy-config: OPCT plugin to collect e2e failures from previous executions and schedule a new execution running in serial mode with openshift-tests. source-url: | - https://github.com/redhat-openshift-ecosystem/provider-certification-tool/\ + https://github.com/redhat-openshift-ecosystem/opct/\ blob/main/manifests/openshift-conformance-validated.yaml skipCleanup: true spec: diff --git a/data/templates/plugins/openshift-conformance-validated.yaml b/data/templates/plugins/openshift-conformance-validated.yaml index 4a801cee..36c355fb 100644 --- a/data/templates/plugins/openshift-conformance-validated.yaml +++ b/data/templates/plugins/openshift-conformance-validated.yaml @@ -65,7 +65,7 @@ sonobuoy-config: OPCT plugin to schedule e2e tests using openshift-tests tool to validate an OpenShift Container Platform cluster installed in a specific provider. source-url: - "https://github.com/redhat-openshift-ecosystem/provider-certification-tool/\ + "https://github.com/redhat-openshift-ecosystem/opct/\ blob/main/manifests/openshift-conformance-validated.yaml" skipCleanup: true spec: diff --git a/data/templates/plugins/openshift-kube-conformance.yaml b/data/templates/plugins/openshift-kube-conformance.yaml index 764a4eb0..82c9b360 100644 --- a/data/templates/plugins/openshift-kube-conformance.yaml +++ b/data/templates/plugins/openshift-kube-conformance.yaml @@ -65,7 +65,7 @@ sonobuoy-config: OPCT plugin to schedule e2e tests using openshift-tests tool to validate an OpenShift Container Platform cluster installed in a specific provider. source-url: - "https://github.com/redhat-openshift-ecosystem/provider-certification-tool/\ + "https://github.com/redhat-openshift-ecosystem/opct/\ blob/main/manifests/openshift-kube-conformance.yaml" skipCleanup: true spec: diff --git a/data/templates/report/report.html b/data/templates/report/report.html index e4948adf..056fb29c 100644 --- a/data/templates/report/report.html +++ b/data/templates/report/report.html @@ -34,7 +34,7 @@
× Warning! This report is under developer preview. - If you encounter any issues or bugs, please report on Github Project or in + If you encounter any issues or bugs, please report on Github Project or in Jira. Thanks!
@@ -88,7 +88,7 @@ --> - + GitHub logo
diff --git a/docs/home_opct.apps/index.html b/docs/home_opct.apps/index.html index ef5e5f2f..db132968 100644 --- a/docs/home_opct.apps/index.html +++ b/docs/home_opct.apps/index.html @@ -3,7 +3,7 @@ OPCT - + \ No newline at end of file diff --git a/docs/support-guide.md b/docs/support-guide.md index c9b18c84..7894b578 100644 --- a/docs/support-guide.md +++ b/docs/support-guide.md @@ -53,7 +53,7 @@ pip3 install o-must-gather --user ### Download Baseline CI results -The OPCT run periodically ([source code](https://github.com/openshift/release/blob/master/ci-operator/jobs/redhat-openshift-ecosystem/provider-certification-tool/redhat-openshift-ecosystem-provider-certification-tool-main-periodics.yaml)) in OpenShift CI using the latest stable release of OpenShift. +The OPCT run periodically ([source code](https://github.com/openshift/release/blob/master/ci-operator/jobs/redhat-openshift-ecosystem/opct/redhat-openshift-ecosystem-provider-certification-tool-main-periodics.yaml)) in OpenShift CI using the latest stable release of OpenShift. These baseline results are stored long-term in an AWS S3 bucket (`s3://openshift-provider-certification/baseline-results`). An HTML listing can be found [here](https://openshift-provider-certification.s3.us-west-2.amazonaws.com/index.html). These baseline results should be used as a reference when reviewing a partner's conformance results. diff --git a/go.mod b/go.mod index 43fbc75e..8df4e6db 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/redhat-openshift-ecosystem/provider-certification-tool +module github.com/redhat-openshift-ecosystem/opct go 1.22.0 diff --git a/hack/Containerfile b/hack/Containerfile index f2aab3aa..e54a21ed 100644 --- a/hack/Containerfile +++ b/hack/Containerfile @@ -2,7 +2,7 @@ FROM docker.io/golang:1.22-alpine AS builder ARG RELEASE_TAG RUN apk add --no-cache --update make git -WORKDIR /go/src/github.com/redhat-openshift-ecosystem/provider-certification-tool +WORKDIR /go/src/github.com/redhat-openshift-ecosystem/opct COPY . . RUN make build-linux-amd64 RELEASE_TAG=${RELEASE_TAG} @@ -13,7 +13,7 @@ LABEL io.k8s.display-name="OPCT" \ io.opct.os="linux" io.opct.arch="amd64" COPY --from=builder \ - /go/src/github.com/redhat-openshift-ecosystem/provider-certification-tool/build/opct-linux-amd64 \ + /go/src/github.com/redhat-openshift-ecosystem/opct/build/opct-linux-amd64 \ /usr/bin/opct CMD ["/usr/bin/opct"] diff --git a/hack/generate-changelog.sh b/hack/generate-changelog.sh index 50d46ee7..225fd534 100755 --- a/hack/generate-changelog.sh +++ b/hack/generate-changelog.sh @@ -27,7 +27,7 @@ first_commit=$(git rev-list --max-parents=0 HEAD) init_release=$first_commit for rel in "${releases[@]}"; do ch_file=$chagelog_dir/$rel.md - echo -e "\n## [$rel](https://github.com/redhat-openshift-ecosystem/provider-certification-tool/releases/tag/$rel)" > "$ch_file" + echo -e "\n## [$rel](https://github.com/redhat-openshift-ecosystem/opct/releases/tag/$rel)" > "$ch_file" echo -e "\n### OPCT\n" >> "$ch_file" # read the git log with changes between releases (from/to) @@ -35,7 +35,7 @@ for rel in "${releases[@]}"; do while read -r line do commit="$(echo "$line" | awk '{print$1}')" - commit_url="[$commit](https://github.com/redhat-openshift-ecosystem/provider-certification-tool/commit/$commit)" + commit_url="[$commit](https://github.com/redhat-openshift-ecosystem/opct/commit/$commit)" line="${line#"$commit"}" jira_card=$(echo "$line" | grep -Po '(OPCT-\d+)' || true) if [ -n "${jira_card-}" ] ; then @@ -45,7 +45,7 @@ for rel in "${releases[@]}"; do # lookup for PR number (#{\d+}) in the commit name pr_id=$(echo "$line" | grep -Po '#\d+' || true) if [ -n "${pr_id-}" ] ; then - line=$(echo "$line" | sed "s/$pr_id/\[$pr_id\]\(https\:\/\/github.com\/redhat-openshift-ecosystem\/provider-certification-tool\/pull\/${pr_id#\#}\)/") + line=$(echo "$line" | sed "s/$pr_id/\[$pr_id\]\(https\:\/\/github.com\/redhat-openshift-ecosystem\/opct\/pull\/${pr_id#\#}\)/") fi echo -e "- $commit_url - ${line}" >> "$ch_file" done @@ -65,7 +65,7 @@ git log --pretty=oneline --abbrev-commit --no-decorate --no-color "$init_release while read -r line do commit="$(echo $line | awk '{print$1}')" - commit_url="[$commit](https://github.com/redhat-openshift-ecosystem/provider-certification-tool/commit/$commit)" + commit_url="[$commit](https://github.com/redhat-openshift-ecosystem/opct/commit/$commit)" line="${line#"$commit"}" jira_card=$(echo $line | grep -Po '(OPCT-\d+)' || true) if [ -n "${jira_card-}" ] ; then @@ -73,7 +73,7 @@ do fi pr_id=$(echo $line | grep -Po '#\d+' || true) if [ -n "${pr_id-}" ] ; then - line=$(echo $line | sed "s/$pr_id/\[$pr_id\]\(https\:\/\/github.com\/redhat-openshift-ecosystem\/provider-certification-tool\/pull\/${pr_id#\#}\)/") + line=$(echo $line | sed "s/$pr_id/\[$pr_id\]\(https\:\/\/github.com\/redhat-openshift-ecosystem\/opct\/pull\/${pr_id#\#}\)/") fi echo -e "- $commit_url - ${line}" >> "$ch_file" done diff --git a/hack/go-imports.sh b/hack/go-imports.sh index 2906db81..d00d60cb 100755 --- a/hack/go-imports.sh +++ b/hack/go-imports.sh @@ -9,8 +9,8 @@ if [ "$IS_CONTAINER" != "" ]; then else podman run --rm \ --env IS_CONTAINER=TRUE \ - --volume "${PWD}:/go/src/github.com/redhat-openshift-ecosystem/provider-certification-tool:z" \ - --workdir /go/src/github.com/redhat-openshift-ecosystem/provider-certification-tool \ + --volume "${PWD}:/go/src/github.com/redhat-openshift-ecosystem/opct:z" \ + --workdir /go/src/github.com/redhat-openshift-ecosystem/opct \ docker.io/golang:1.19 \ ./hack/go-imports.sh "${@}" fi diff --git a/hack/go-staticcheck.sh b/hack/go-staticcheck.sh index 3835d11b..2326f00a 100755 --- a/hack/go-staticcheck.sh +++ b/hack/go-staticcheck.sh @@ -7,8 +7,8 @@ if [ "$IS_CONTAINER" != "" ]; then else podman run --rm \ --env IS_CONTAINER=TRUE \ - --volume "${PWD}:/go/src/github.com/redhat-openshift-ecosystem/provider-certification-tool:z" \ - --workdir /go/src/github.com/redhat-openshift-ecosystem/provider-certification-tool \ + --volume "${PWD}:/go/src/github.com/redhat-openshift-ecosystem/opct:z" \ + --workdir /go/src/github.com/redhat-openshift-ecosystem/opct \ docker.io/golang:1.19 \ ./hack/go-staticcheck.sh "${@}" fi diff --git a/internal/opct/archive/metaconfig_test.go b/internal/opct/archive/metaconfig_test.go index f1643595..aaccefe6 100644 --- a/internal/opct/archive/metaconfig_test.go +++ b/internal/opct/archive/metaconfig_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - opcttests "github.com/redhat-openshift-ecosystem/provider-certification-tool/test" + opcttests "github.com/redhat-openshift-ecosystem/opct/test" ) var testDataMetaConfig MetaConfigSonobuoy diff --git a/internal/opct/archive/metalog_test.go b/internal/opct/archive/metalog_test.go index 7d4df465..9e43e349 100644 --- a/internal/opct/archive/metalog_test.go +++ b/internal/opct/archive/metalog_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - opcttests "github.com/redhat-openshift-ecosystem/provider-certification-tool/test" + opcttests "github.com/redhat-openshift-ecosystem/opct/test" ) func TestParseMetaLogs(t *testing.T) { diff --git a/internal/opct/archive/opctconfigmap_test.go b/internal/opct/archive/opctconfigmap_test.go index f29c6823..a0e971f9 100644 --- a/internal/opct/archive/opctconfigmap_test.go +++ b/internal/opct/archive/opctconfigmap_test.go @@ -10,7 +10,7 @@ import ( "reflect" "testing" - opcttests "github.com/redhat-openshift-ecosystem/provider-certification-tool/test" + opcttests "github.com/redhat-openshift-ecosystem/opct/test" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/opct/plugin/plugin.go b/internal/opct/plugin/plugin.go index 5471f647..e4235d10 100644 --- a/internal/opct/plugin/plugin.go +++ b/internal/opct/plugin/plugin.go @@ -1,7 +1,7 @@ package plugin import ( - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/archive" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/archive" ) const ( diff --git a/internal/opct/plugin/test.go b/internal/opct/plugin/test.go index 4840b212..2dbfb5b4 100644 --- a/internal/opct/plugin/test.go +++ b/internal/opct/plugin/test.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/archive" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/openshift/ci/sippy" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/archive" + "github.com/redhat-openshift-ecosystem/opct/internal/openshift/ci/sippy" ) // TestItem represents a single test unit holding attributes for the processor diff --git a/internal/opct/summary/consolidated.go b/internal/opct/summary/consolidated.go index 1e355a9a..5cc0a522 100644 --- a/internal/opct/summary/consolidated.go +++ b/internal/opct/summary/consolidated.go @@ -14,10 +14,10 @@ import ( "github.com/pkg/errors" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/metrics" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/plugin" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/openshift/ci/sippy" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/report/baseline" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/metrics" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/plugin" + "github.com/redhat-openshift-ecosystem/opct/internal/openshift/ci/sippy" + "github.com/redhat-openshift-ecosystem/opct/internal/report/baseline" ) // ConsolidatedSummary Aggregate the results of provider and baseline diff --git a/internal/opct/summary/openshift.go b/internal/opct/summary/openshift.go index 0124fd1b..e451a4a1 100644 --- a/internal/opct/summary/openshift.go +++ b/internal/opct/summary/openshift.go @@ -8,7 +8,7 @@ import ( configv1 "github.com/openshift/api/config/v1" "github.com/pkg/errors" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/plugin" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/plugin" v1 "k8s.io/api/core/v1" ) diff --git a/internal/opct/summary/result.go b/internal/opct/summary/result.go index ddcb5459..574e037c 100644 --- a/internal/opct/summary/result.go +++ b/internal/opct/summary/result.go @@ -10,10 +10,10 @@ import ( "strings" "github.com/pkg/errors" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/archive" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/plugin" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/openshift/mustgather" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/openshift/mustgathermetrics" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/archive" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/plugin" + "github.com/redhat-openshift-ecosystem/opct/internal/openshift/mustgather" + "github.com/redhat-openshift-ecosystem/opct/internal/openshift/mustgathermetrics" log "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" diff --git a/internal/opct/summary/sonobuoy.go b/internal/opct/summary/sonobuoy.go index b193b1ef..d8d85b3d 100644 --- a/internal/opct/summary/sonobuoy.go +++ b/internal/opct/summary/sonobuoy.go @@ -4,7 +4,7 @@ import ( "bytes" "strings" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/archive" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/archive" "github.com/vmware-tanzu/sonobuoy/pkg/discovery" "github.com/vmware-tanzu/sonobuoy/pkg/plugin/manifest" v1 "k8s.io/api/core/v1" diff --git a/internal/openshift/mustgather/etcd.go b/internal/openshift/mustgather/etcd.go index 2d06c042..bf4eccbb 100644 --- a/internal/openshift/mustgather/etcd.go +++ b/internal/openshift/mustgather/etcd.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/montanaflynn/stats" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/archive" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/archive" log "github.com/sirupsen/logrus" ) diff --git a/internal/openshift/mustgather/log.go b/internal/openshift/mustgather/log.go index 96cde68c..e0881f0d 100644 --- a/internal/openshift/mustgather/log.go +++ b/internal/openshift/mustgather/log.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/archive" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/archive" log "github.com/sirupsen/logrus" ) diff --git a/internal/openshift/mustgather/mustgather.go b/internal/openshift/mustgather/mustgather.go index ed3415f9..251ec8ad 100644 --- a/internal/openshift/mustgather/mustgather.go +++ b/internal/openshift/mustgather/mustgather.go @@ -11,7 +11,7 @@ import ( "sync" "github.com/pkg/errors" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/archive" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/archive" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" "k8s.io/utils/ptr" diff --git a/internal/report/data.go b/internal/report/data.go index 78e032db..d6456abb 100644 --- a/internal/report/data.go +++ b/internal/report/data.go @@ -13,12 +13,12 @@ import ( "sort" "strings" - vfs "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/assets" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/archive" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/metrics" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/plugin" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/summary" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/openshift/mustgather" + vfs "github.com/redhat-openshift-ecosystem/opct/internal/assets" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/archive" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/metrics" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/plugin" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/summary" + "github.com/redhat-openshift-ecosystem/opct/internal/openshift/mustgather" log "github.com/sirupsen/logrus" "github.com/vmware-tanzu/sonobuoy/pkg/discovery" ) diff --git a/internal/report/slo.go b/internal/report/slo.go index a8ee3329..71322d78 100644 --- a/internal/report/slo.go +++ b/internal/report/slo.go @@ -11,13 +11,13 @@ import ( "strconv" "strings" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/plugin" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/plugin" log "github.com/sirupsen/logrus" ) const ( docsRulesPath = "/review/rules" - defaultBaseURL = "https://redhat-openshift-ecosystem.github.io/provider-certification-tool" + defaultBaseURL = "https://redhat-openshift-ecosystem.github.io/opct" CheckResultNamePass CheckResultName = "pass" CheckResultNameFail CheckResultName = "fail" @@ -121,7 +121,7 @@ func NewCheckSummary(re *ReportData) *CheckSummary { msgDefaultNotMatch := "default value does not match the acceptance criteria" // Developer environment: // $ mkdocs serve - // $ export OPCT_DEV_BASE_URL_DOC="http://127.0.0.1:8000/provider-certification-tool" + // $ export OPCT_DEV_BASE_URL_DOC="http://127.0.0.1:8000/opct" localDevBaseURL := os.Getenv("OPCT_DEV_BASE_URL_DOC") if localDevBaseURL != "" { baseURL = localDevBaseURL diff --git a/main.go b/main.go index d092ac2a..946dba46 100644 --- a/main.go +++ b/main.go @@ -3,8 +3,8 @@ package main import ( "embed" - cmd "github.com/redhat-openshift-ecosystem/provider-certification-tool/cmd/opct" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/assets" + cmd "github.com/redhat-openshift-ecosystem/opct/cmd/opct" + "github.com/redhat-openshift-ecosystem/opct/internal/assets" ) //go:embed data/templates diff --git a/pkg/cmd/adm/baseline/get.go b/pkg/cmd/adm/baseline/get.go index 85528b50..22097711 100644 --- a/pkg/cmd/adm/baseline/get.go +++ b/pkg/cmd/adm/baseline/get.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/report" - reb "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/report/baseline" + "github.com/redhat-openshift-ecosystem/opct/internal/report" + reb "github.com/redhat-openshift-ecosystem/opct/internal/report/baseline" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/adm/baseline/indexer.go b/pkg/cmd/adm/baseline/indexer.go index 9254f642..be740494 100644 --- a/pkg/cmd/adm/baseline/indexer.go +++ b/pkg/cmd/adm/baseline/indexer.go @@ -5,7 +5,7 @@ import ( log "github.com/sirupsen/logrus" - reb "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/report/baseline" + reb "github.com/redhat-openshift-ecosystem/opct/internal/report/baseline" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/adm/baseline/list.go b/pkg/cmd/adm/baseline/list.go index 36677890..638a9be5 100644 --- a/pkg/cmd/adm/baseline/list.go +++ b/pkg/cmd/adm/baseline/list.go @@ -5,7 +5,7 @@ import ( "os" "sort" - reb "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/report/baseline" + reb "github.com/redhat-openshift-ecosystem/opct/internal/report/baseline" table "github.com/jedib0t/go-pretty/v6/table" "github.com/spf13/cobra" diff --git a/pkg/cmd/adm/baseline/publish.go b/pkg/cmd/adm/baseline/publish.go index 3181b834..ff49b039 100644 --- a/pkg/cmd/adm/baseline/publish.go +++ b/pkg/cmd/adm/baseline/publish.go @@ -8,10 +8,10 @@ import ( "os" "path/filepath" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/metrics" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/summary" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/report" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/report/baseline" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/metrics" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/summary" + "github.com/redhat-openshift-ecosystem/opct/internal/report" + "github.com/redhat-openshift-ecosystem/opct/internal/report/baseline" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/adm/parseetcdlogs.go b/pkg/cmd/adm/parseetcdlogs.go index 740d55fd..2d0c3788 100644 --- a/pkg/cmd/adm/parseetcdlogs.go +++ b/pkg/cmd/adm/parseetcdlogs.go @@ -12,8 +12,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/archive" - mg "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/openshift/mustgather" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/archive" + mg "github.com/redhat-openshift-ecosystem/opct/internal/openshift/mustgather" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/adm/parsemetrics.go b/pkg/cmd/adm/parsemetrics.go index 2ae21171..3ec06eb0 100644 --- a/pkg/cmd/adm/parsemetrics.go +++ b/pkg/cmd/adm/parsemetrics.go @@ -8,7 +8,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/openshift/mustgathermetrics" + "github.com/redhat-openshift-ecosystem/opct/internal/openshift/mustgathermetrics" ) type parseMetricsInput struct { diff --git a/pkg/cmd/adm/root.go b/pkg/cmd/adm/root.go index 537049b4..ca467ee9 100644 --- a/pkg/cmd/adm/root.go +++ b/pkg/cmd/adm/root.go @@ -1,7 +1,7 @@ package adm import ( - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/cmd/adm/baseline" + "github.com/redhat-openshift-ecosystem/opct/pkg/cmd/adm/baseline" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/pkg/cmd/adm/setupNode.go b/pkg/cmd/adm/setupNode.go index 57ce8d69..fe03e8e8 100644 --- a/pkg/cmd/adm/setupNode.go +++ b/pkg/cmd/adm/setupNode.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/client" + "github.com/redhat-openshift-ecosystem/opct/pkg/client" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" v1 "k8s.io/api/core/v1" diff --git a/pkg/cmd/get/images.go b/pkg/cmd/get/images.go index d532ad7f..2e2c891d 100644 --- a/pkg/cmd/get/images.go +++ b/pkg/cmd/get/images.go @@ -3,7 +3,7 @@ package get import ( "fmt" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg" + "github.com/redhat-openshift-ecosystem/opct/pkg" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/report/report.go b/pkg/cmd/report/report.go index 249af619..e1a40ec3 100644 --- a/pkg/cmd/report/report.go +++ b/pkg/cmd/report/report.go @@ -14,10 +14,10 @@ import ( table "github.com/jedib0t/go-pretty/v6/table" tabletext "github.com/jedib0t/go-pretty/v6/text" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/metrics" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/plugin" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/opct/summary" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/report" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/metrics" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/plugin" + "github.com/redhat-openshift-ecosystem/opct/internal/opct/summary" + "github.com/redhat-openshift-ecosystem/opct/internal/report" log "github.com/sirupsen/logrus" "github.com/vmware-tanzu/sonobuoy/pkg/errlog" ) diff --git a/pkg/destroy/destroy.go b/pkg/destroy/destroy.go index 4cbf75a5..48da6301 100644 --- a/pkg/destroy/destroy.go +++ b/pkg/destroy/destroy.go @@ -11,8 +11,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/client" + "github.com/redhat-openshift-ecosystem/opct/pkg" + "github.com/redhat-openshift-ecosystem/opct/pkg/client" ) const ( diff --git a/pkg/retrieve/retrieve.go b/pkg/retrieve/retrieve.go index 58ffcfd7..afbb00af 100644 --- a/pkg/retrieve/retrieve.go +++ b/pkg/retrieve/retrieve.go @@ -15,8 +15,8 @@ import ( config2 "github.com/vmware-tanzu/sonobuoy/pkg/config" "golang.org/x/sync/errgroup" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/status" + "github.com/redhat-openshift-ecosystem/opct/pkg" + "github.com/redhat-openshift-ecosystem/opct/pkg/status" ) func NewCmdRetrieve() *cobra.Command { diff --git a/pkg/run/manifests.go b/pkg/run/manifests.go index 6162051e..cfd24b19 100644 --- a/pkg/run/manifests.go +++ b/pkg/run/manifests.go @@ -5,7 +5,7 @@ import ( "text/template" "github.com/pkg/errors" - efs "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/assets" + efs "github.com/redhat-openshift-ecosystem/opct/internal/assets" log "github.com/sirupsen/logrus" "github.com/vmware-tanzu/sonobuoy/pkg/plugin/loader" "github.com/vmware-tanzu/sonobuoy/pkg/plugin/manifest" diff --git a/pkg/run/run.go b/pkg/run/run.go index ca7c1464..b145fa47 100644 --- a/pkg/run/run.go +++ b/pkg/run/run.go @@ -12,7 +12,7 @@ import ( irclient "github.com/openshift/client-go/imageregistry/clientset/versioned" mcfgclientset "github.com/openshift/client-go/machineconfiguration/clientset/versioned" "github.com/pkg/errors" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/version" + "github.com/redhat-openshift-ecosystem/opct/pkg/version" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/vmware-tanzu/sonobuoy/pkg/buildinfo" @@ -22,10 +22,10 @@ import ( "github.com/vmware-tanzu/sonobuoy/pkg/plugin/manifest" v1 "k8s.io/api/core/v1" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/client" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/status" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/wait" + "github.com/redhat-openshift-ecosystem/opct/pkg" + "github.com/redhat-openshift-ecosystem/opct/pkg/client" + "github.com/redhat-openshift-ecosystem/opct/pkg/status" + "github.com/redhat-openshift-ecosystem/opct/pkg/wait" rbacv1 "k8s.io/api/rbac/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -40,7 +40,7 @@ type RunOptions struct { imageRepository string // PluginsImage - // defines the image containing plugins associated with the provider-certification-tool. + // defines the image containing plugins associated with the opct. // this variable is referenced by plugin manifest templates to dynamically reference the plugins image. PluginsImage string CollectorImage string @@ -250,7 +250,7 @@ func (r *RunOptions) PreRunCheck(kclient kubernetes.Interface) error { if len(nodes.Items) == 0 { errMsg := fmt.Sprintf("missing dedicated node. Set the label %q to a node and try again", pkg.DedicatedNodeRoleLabelSelector) errMsg = fmt.Sprintf("%s\nCheck the documentation[1] or run 'opct adm setup-node' to set the label and taints", errMsg) - errMsg = fmt.Sprintf("%s\n[1] https://redhat-openshift-ecosystem.github.io/provider-certification-tool/user/#standard-env-setup-node", errMsg) + errMsg = fmt.Sprintf("%s\n[1] https://redhat-openshift-ecosystem.github.io/opct/user/#standard-env-setup-node", errMsg) return fmt.Errorf(errMsg) } if len(nodes.Items) > 2 { diff --git a/pkg/status/cmd.go b/pkg/status/cmd.go index 7e0f5f41..b8efd71a 100644 --- a/pkg/status/cmd.go +++ b/pkg/status/cmd.go @@ -1,7 +1,7 @@ package status import ( - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/wait" + "github.com/redhat-openshift-ecosystem/opct/pkg/wait" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/pkg/status/printer.go b/pkg/status/printer.go index b3971019..a7598570 100644 --- a/pkg/status/printer.go +++ b/pkg/status/printer.go @@ -7,7 +7,7 @@ import ( "sort" "time" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg" + "github.com/redhat-openshift-ecosystem/opct/pkg" "github.com/vmware-tanzu/sonobuoy/pkg/plugin/aggregation" ) diff --git a/pkg/status/status.go b/pkg/status/status.go index a91e76fa..974c3902 100644 --- a/pkg/status/status.go +++ b/pkg/status/status.go @@ -14,8 +14,8 @@ import ( wait2 "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/client" + "github.com/redhat-openshift-ecosystem/opct/pkg" + "github.com/redhat-openshift-ecosystem/opct/pkg/client" ) const ( diff --git a/pkg/version/version.go b/pkg/version/version.go index 610abc67..c0236d11 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -5,7 +5,7 @@ package version import ( "fmt" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg" + "github.com/redhat-openshift-ecosystem/opct/pkg" "github.com/spf13/cobra" "github.com/vmware-tanzu/sonobuoy/pkg/buildinfo" ) diff --git a/pkg/wait/util.go b/pkg/wait/util.go index 36f04457..8d6bebc5 100644 --- a/pkg/wait/util.go +++ b/pkg/wait/util.go @@ -14,7 +14,7 @@ import ( "k8s.io/client-go/tools/cache" watchtools "k8s.io/client-go/tools/watch" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg" + "github.com/redhat-openshift-ecosystem/opct/pkg" ) // WaitForRequiredResources will wait for the sonobuoy pod in the sonobuoy namespace to go into diff --git a/test/manifests_test.go b/test/manifests_test.go index 10d4d67f..a61b29c5 100644 --- a/test/manifests_test.go +++ b/test/manifests_test.go @@ -4,8 +4,8 @@ import ( "embed" "testing" - efs "github.com/redhat-openshift-ecosystem/provider-certification-tool/internal/assets" - "github.com/redhat-openshift-ecosystem/provider-certification-tool/pkg/run" + efs "github.com/redhat-openshift-ecosystem/opct/internal/assets" + "github.com/redhat-openshift-ecosystem/opct/pkg/run" "github.com/stretchr/testify/assert" ) diff --git a/test/testdata/plugins/sample-v0-ok.yaml b/test/testdata/plugins/sample-v0-ok.yaml index d3569e61..a6aafb4e 100644 --- a/test/testdata/plugins/sample-v0-ok.yaml +++ b/test/testdata/plugins/sample-v0-ok.yaml @@ -36,7 +36,7 @@ sonobuoy-config: plugin-name: 99-openshift-artifacts-collector result-format: raw description: The OpenShift Provider Certification Tool artifacts collector executed on the post-certification. - source-url: https://github.com/redhat-openshift-ecosystem/provider-certification-tool/blob/main/manifests/openshift-artifacts-collector.yaml + source-url: https://github.com/redhat-openshift-ecosystem/opct/blob/main/manifests/openshift-artifacts-collector.yaml skipCleanup: true spec: name: plugin diff --git a/test/testdata/plugins/sample-v1-fail.yaml b/test/testdata/plugins/sample-v1-fail.yaml index 7d85590d..582ec9c2 100644 --- a/test/testdata/plugins/sample-v1-fail.yaml +++ b/test/testdata/plugins/sample-v1-fail.yaml @@ -36,7 +36,7 @@ sonobuoy-config: plugin-name: 99-openshift-artifacts-collector result-format: raw description: The OpenShift Provider Certification Tool artifacts collector executed on the post-certification. - source-url: https://github.com/redhat-openshift-ecosystem/provider-certification-tool/blob/main/manifests/openshift-artifacts-collector.yaml + source-url: https://github.com/redhat-openshift-ecosystem/opct/blob/main/manifests/openshift-artifacts-collector.yaml skipCleanup: true spec: name: plugin diff --git a/test/testdata/templates/plugins/sample.yaml b/test/testdata/templates/plugins/sample.yaml index 893b2a50..49d7c430 100644 --- a/test/testdata/templates/plugins/sample.yaml +++ b/test/testdata/templates/plugins/sample.yaml @@ -36,7 +36,7 @@ sonobuoy-config: plugin-name: 99-openshift-artifacts-collector result-format: raw description: The OpenShift Provider Certification Tool artifacts collector executed on the post-certification. - source-url: https://github.com/redhat-openshift-ecosystem/provider-certification-tool/blob/main/manifests/openshift-artifacts-collector.yaml + source-url: https://github.com/redhat-openshift-ecosystem/opct/blob/main/manifests/openshift-artifacts-collector.yaml skipCleanup: true spec: name: plugin