Skip to content

Commit

Permalink
chore: migration to konflux-ci org (#1193)
Browse files Browse the repository at this point in the history
  • Loading branch information
psturc authored May 31, 2024
1 parent 8c519d9 commit d2a9084
Show file tree
Hide file tree
Showing 115 changed files with 367 additions and 364 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/PR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'
- run: go version
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/loadtest-README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# How to upload offline tokens to GitHub secrets for loadtest workflow

Staging users are splitted and stored as base64 encoded secrets - STAGING_USERS_1, STAGING_USERS_2, STAGING_USERS_3, STAGING_USERS_4
The GITHUB secrets link is <https://github.com/redhat-appstudio/e2e-tests/settings/secrets/actions>
The GITHUB secrets link is <https://github.com/konflux-ci/e2e-tests/settings/secrets/actions>
or for any fork (like: naftalysh) in <https://github.com/naftalysh/e2e-tests/settings/secrets/actions>

# The users secrets creation process
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.ci.openshift.org/openshift/release:golang-1.21 AS builder

WORKDIR /github.com/redhat-appstudio/e2e-tests
WORKDIR /github.com/konflux-ci/e2e-tests
USER root

COPY go.mod .
Expand All @@ -17,6 +17,6 @@ RUN make build
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest

WORKDIR /root/
COPY --from=builder /github.com/redhat-appstudio/e2e-tests/bin/e2e-appstudio ./
COPY --from=builder /github.com/redhat-appstudio/e2e-tests/tests ./tests
COPY --from=builder /github.com/konflux-ci/e2e-tests/bin/e2e-appstudio ./
COPY --from=builder /github.com/konflux-ci/e2e-tests/tests ./tests
ENTRYPOINT ["/root/e2e-appstudio"]
18 changes: 9 additions & 9 deletions cmd/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import (
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"

_ "github.com/redhat-appstudio/e2e-tests/tests/build"
_ "github.com/redhat-appstudio/e2e-tests/tests/enterprise-contract"
_ "github.com/redhat-appstudio/e2e-tests/tests/integration-service"
_ "github.com/redhat-appstudio/e2e-tests/tests/release/pipelines"
_ "github.com/redhat-appstudio/e2e-tests/tests/release/service"
_ "github.com/redhat-appstudio/e2e-tests/tests/remote-secret"
_ "github.com/redhat-appstudio/e2e-tests/tests/rhtap-demo"
_ "github.com/redhat-appstudio/e2e-tests/tests/spi"
_ "github.com/redhat-appstudio/e2e-tests/tests/upgrade"
_ "github.com/konflux-ci/e2e-tests/tests/build"
_ "github.com/konflux-ci/e2e-tests/tests/enterprise-contract"
_ "github.com/konflux-ci/e2e-tests/tests/integration-service"
_ "github.com/konflux-ci/e2e-tests/tests/release/pipelines"
_ "github.com/konflux-ci/e2e-tests/tests/release/service"
_ "github.com/konflux-ci/e2e-tests/tests/remote-secret"
_ "github.com/konflux-ci/e2e-tests/tests/rhtap-demo"
_ "github.com/konflux-ci/e2e-tests/tests/spi"
_ "github.com/konflux-ci/e2e-tests/tests/upgrade"

"flag"

Expand Down
21 changes: 11 additions & 10 deletions cmd/loadTests.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import (
"github.com/devfile/library/v2/pkg/util"
"github.com/gosuri/uiprogress"
"github.com/gosuri/uitable/util/strutil"
"github.com/konflux-ci/e2e-tests/pkg/constants"
"github.com/konflux-ci/e2e-tests/pkg/framework"
"github.com/konflux-ci/e2e-tests/pkg/utils"
loadtestUtils "github.com/konflux-ci/e2e-tests/pkg/utils/loadtests"
integrationv1beta1 "github.com/konflux-ci/integration-service/api/v1beta1"
metricsConstants "github.com/redhat-appstudio-qe/perf-monitoring/api/pkg/constants"
"github.com/redhat-appstudio-qe/perf-monitoring/api/pkg/metrics"
appstudioApi "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/e2e-tests/pkg/constants"
"github.com/redhat-appstudio/e2e-tests/pkg/framework"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
loadtestUtils "github.com/redhat-appstudio/e2e-tests/pkg/utils/loadtests"
integrationv1beta1 "github.com/konflux-ci/integration-service/api/v1beta1"
"github.com/spf13/cobra"
pipeline "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
appsv1 "k8s.io/api/apps/v1"
Expand Down Expand Up @@ -406,7 +406,8 @@ type JourneyContext struct {
ChDeployments chan string
userAppsCompsMap UserAppsCompsMap
}
var journeyContexts []*JourneyContext // pointers to all thread contexts

var journeyContexts []*JourneyContext // pointers to all thread contexts

func createLogDataJSON(outputFile string, logDataInput LogData) error {
jsonData, err := json.MarshalIndent(logDataInput, "", " ")
Expand Down Expand Up @@ -836,7 +837,7 @@ func setup(cmd *cobra.Command, args []string) {

logData.MaxTimeToCreateComponents = maxDurationFromArray(ComponentCreationTimeMaxPerThread).Seconds()

componentCreationFailureRate := float64(componentCreationFailureCount) / float64(overallCount * componentsCount)
componentCreationFailureRate := float64(componentCreationFailureCount) / float64(overallCount*componentsCount)
logData.ComponentCreationFailureRate = componentCreationFailureRate

// Compile data about PipelineRuns
Expand All @@ -860,7 +861,7 @@ func setup(cmd *cobra.Command, args []string) {
}
logData.AverageTimeToRunPipelineFailed = averageTimeToRunPipelineFailed

pipelineRunFailureRate := float64(pipelineRunFailureCount) / float64(overallCount * componentsCount)
pipelineRunFailureRate := float64(pipelineRunFailureCount) / float64(overallCount*componentsCount)
logData.PipelineRunFailureRate = pipelineRunFailureRate

// Compile data about integration tests
Expand All @@ -884,7 +885,7 @@ func setup(cmd *cobra.Command, args []string) {
}
logData.IntegrationTestsAverageTimeToRunPipelineFailed = IntegrationTestsAverageTimeToRunPipelineFailed

IntegrationTestsPipelineRunFailureRate := float64(integrationTestsPipelineRunFailureCount) / float64(overallCount * componentsCount)
IntegrationTestsPipelineRunFailureRate := float64(integrationTestsPipelineRunFailureCount) / float64(overallCount*componentsCount)
logData.IntegrationTestsPipelineRunFailureRate = IntegrationTestsPipelineRunFailureRate

// Compile data about Deployments
Expand All @@ -908,7 +909,7 @@ func setup(cmd *cobra.Command, args []string) {
}
logData.AverageTimeToDeploymentFailed = averageTimeToDeploymentFailed

deploymentFailureRate := float64(deploymentFailureCount) / float64(overallCount * componentsCount)
deploymentFailureRate := float64(deploymentFailureCount) / float64(overallCount*componentsCount)
logData.DeploymentFailureRate = deploymentFailureRate

workloadKPI := logData.AverageTimeToCreateApplications + logData.AverageTimeToCreateCDQs + logData.AverageTimeToCreateComponents + logData.AverageTimeToRunPipelineSucceeded + logData.AverageTimeToDeploymentSucceeded
Expand Down
6 changes: 3 additions & 3 deletions docs/DeveloperGenerateTest.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ import (
"strings"
"time"

"github.com/redhat-appstudio/e2e-tests/pkg/framework"
"github.com/konflux-ci/e2e-tests/pkg/framework"
//framework imports edit as required
"github.com/redhat-appstudio/e2e-tests/pkg/constants"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
"github.com/konflux-ci/e2e-tests/pkg/constants"
"github.com/konflux-ci/e2e-tests/pkg/utils"
)

var _ = framework.BookSuiteDescribe("Book service E2E tests", func() {
Expand Down
2 changes: 1 addition & 1 deletion docs/Guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The purpose of *this* document is to serve as a primer for developers/qe who are
* Make sure you've implemented any required controller functionality that is required for your tests within the following files
* `pkg/clients/<new controller directory>` - logic to interact with kube controllers via API
* `pkg/framework/framework.go` - import the new controller and update the `Framework` struct to be able to initialize the new controller
* Every test package should be imported to [cmd/e2e_test.go](https://github.com/redhat-appstudio/e2e-tests/blob/main/cmd/e2e_test.go#L15).
* Every test package should be imported to [cmd/e2e_test.go](https://github.com/konflux-ci/e2e-tests/blob/main/cmd/e2e_test.go#L15).
* Every new test should have correct [labels](docs/LabelsNaming.md).
* Every test should have meaningful description with JIRA/GitHub issue key.
* (Recommended) Use JIRA integration for linking issues and commits (just add JIRA issue key in the commit message).
Expand Down
4 changes: 2 additions & 2 deletions docs/Installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ $ go mod tidy
<p>

Some tests could require you have a Github App created in order to test Component builds via Pipelines as Code.
Such tests are [rhtap-demo](https://github.com/redhat-appstudio/e2e-tests/blob/main/tests/rhtap-demo/rhtap-demo.go), [build](https://github.com/redhat-appstudio/e2e-tests/blob/main/tests/build/build.go), and [status-reporting-to-pullrequest](https://github.com/redhat-appstudio/e2e-tests/blob/main/tests/integration-service/status-reporting-to-pullrequest.go).
Such tests are [rhtap-demo](https://github.com/konflux-ci/e2e-tests/blob/main/tests/rhtap-demo/rhtap-demo.go), [build](https://github.com/konflux-ci/e2e-tests/blob/main/tests/build/build.go), and [status-reporting-to-pullrequest](https://github.com/konflux-ci/e2e-tests/blob/main/tests/integration-service/status-reporting-to-pullrequest.go).

In this case, before you bootstrap a cluster, make sure you [created a Github App for your GitHub account](https://github.com/settings/apps). Fill in following details:
</p>
Expand All @@ -72,7 +72,7 @@ export E2E_PAC_GITHUB_APP_PRIVATE_KEY=$(base64 < /PATH/TO/YOUR/DOWNLOADED/PRIVAT
```

<p>
Navigate back to <a href="https://github.com/settings/apps">your GitHub App</a>, select Install App and select your GitHub org (the one that you're using in `MY_GITHUB_ORG` env var). Feel free to install it to all repositories of that organization or the forked repositories currently used by <a href="(https://github.com/redhat-appstudio/e2e-tests/blob/main/tests/rhtap-demo/rhtap-demo.go)">rhtap-demo</a> and <a href="(https://github.com/redhat-appstudio/e2e-tests/blob/main/tests/build/build.go">build tests</a>
Navigate back to <a href="https://github.com/settings/apps">your GitHub App</a>, select Install App and select your GitHub org (the one that you're using in `MY_GITHUB_ORG` env var). Feel free to install it to all repositories of that organization or the forked repositories currently used by <a href="(https://github.com/konflux-ci/e2e-tests/blob/main/tests/rhtap-demo/rhtap-demo.go)">rhtap-demo</a> and <a href="(https://github.com/konflux-ci/e2e-tests/blob/main/tests/build/build.go">build tests</a>
</p>

</details>
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/redhat-appstudio/e2e-tests
module github.com/konflux-ci/e2e-tests

go 1.21

Expand Down
6 changes: 3 additions & 3 deletions magefiles/installation/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
configv1client "github.com/openshift/client-go/config/clientset/versioned"

appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
kubeCl "github.com/redhat-appstudio/e2e-tests/pkg/clients/kubernetes"
"github.com/redhat-appstudio/e2e-tests/pkg/constants"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
kubeCl "github.com/konflux-ci/e2e-tests/pkg/clients/kubernetes"
"github.com/konflux-ci/e2e-tests/pkg/constants"
"github.com/konflux-ci/e2e-tests/pkg/utils"
corev1 "k8s.io/api/core/v1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
18 changes: 9 additions & 9 deletions magefiles/magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ import (
"github.com/google/go-containerregistry/pkg/name"
remoteimg "github.com/google/go-containerregistry/pkg/v1/remote"
gh "github.com/google/go-github/v44/github"
"github.com/konflux-ci/e2e-tests/magefiles/installation"
"github.com/konflux-ci/e2e-tests/magefiles/upgrade"
"github.com/konflux-ci/e2e-tests/pkg/clients/github"
"github.com/konflux-ci/e2e-tests/pkg/clients/slack"
"github.com/konflux-ci/e2e-tests/pkg/clients/sprayproxy"
"github.com/konflux-ci/e2e-tests/pkg/constants"
"github.com/konflux-ci/e2e-tests/pkg/testspecs"
"github.com/konflux-ci/e2e-tests/pkg/utils"
"github.com/konflux-ci/e2e-tests/pkg/utils/tekton"
"github.com/konflux-ci/image-controller/pkg/quay"
"github.com/magefile/mage/sh"
"github.com/redhat-appstudio/e2e-tests/magefiles/installation"
"github.com/redhat-appstudio/e2e-tests/magefiles/upgrade"
"github.com/redhat-appstudio/e2e-tests/pkg/clients/github"
"github.com/redhat-appstudio/e2e-tests/pkg/clients/slack"
"github.com/redhat-appstudio/e2e-tests/pkg/clients/sprayproxy"
"github.com/redhat-appstudio/e2e-tests/pkg/constants"
"github.com/redhat-appstudio/e2e-tests/pkg/testspecs"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
"github.com/redhat-appstudio/e2e-tests/pkg/utils/tekton"
tektonapi "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion magefiles/upgrade/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"strings"
"time"

"github.com/konflux-ci/e2e-tests/pkg/utils"
"github.com/openshift/oc/pkg/cli/admin/upgrade"
"github.com/openshift/oc/pkg/cli/admin/upgrade/channel"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/klog"

Expand Down
4 changes: 2 additions & 2 deletions magefiles/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"github.com/go-git/go-git/v5/plumbing"
plumbingHttp "github.com/go-git/go-git/v5/plumbing/transport/http"
sprig "github.com/go-task/slim-sprig"
"github.com/konflux-ci/e2e-tests/pkg/clients/slack"
"github.com/konflux-ci/e2e-tests/pkg/utils"
"github.com/konflux-ci/image-controller/pkg/quay"
"github.com/magefile/mage/sh"
"github.com/redhat-appstudio/e2e-tests/pkg/clients/slack"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
)

const quayPrefixesToDeleteRegexp = "e2e-demos|has-e2e|multi-comp|build-e2e"
Expand Down
10 changes: 5 additions & 5 deletions pkg/clients/common/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package common
import (
"fmt"

"github.com/redhat-appstudio/e2e-tests/pkg/clients/github"
"github.com/redhat-appstudio/e2e-tests/pkg/clients/gitlab"
kubeCl "github.com/redhat-appstudio/e2e-tests/pkg/clients/kubernetes"
"github.com/redhat-appstudio/e2e-tests/pkg/constants"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
"github.com/konflux-ci/e2e-tests/pkg/clients/github"
"github.com/konflux-ci/e2e-tests/pkg/clients/gitlab"
kubeCl "github.com/konflux-ci/e2e-tests/pkg/clients/kubernetes"
"github.com/konflux-ci/e2e-tests/pkg/constants"
"github.com/konflux-ci/e2e-tests/pkg/utils"
)

// Create the struct for kubernetes and github clients.
Expand Down
4 changes: 2 additions & 2 deletions pkg/clients/common/namespace.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"time"

"github.com/redhat-appstudio/e2e-tests/pkg/constants"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
"github.com/konflux-ci/e2e-tests/pkg/constants"
"github.com/konflux-ci/e2e-tests/pkg/utils"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
4 changes: 2 additions & 2 deletions pkg/clients/common/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"time"

"github.com/konflux-ci/e2e-tests/pkg/logs"
"github.com/konflux-ci/e2e-tests/pkg/utils"
. "github.com/onsi/ginkgo/v2"
"github.com/redhat-appstudio/e2e-tests/pkg/logs"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down
4 changes: 2 additions & 2 deletions pkg/clients/common/proxy_plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"time"

toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
"github.com/redhat-appstudio/e2e-tests/pkg/utils/common"
"github.com/konflux-ci/e2e-tests/pkg/utils"
"github.com/konflux-ci/e2e-tests/pkg/utils/common"

k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
6 changes: 3 additions & 3 deletions pkg/clients/common/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"fmt"
"time"

"github.com/redhat-appstudio/e2e-tests/pkg/constants"
. "github.com/redhat-appstudio/e2e-tests/pkg/constants"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
"github.com/konflux-ci/e2e-tests/pkg/constants"
. "github.com/konflux-ci/e2e-tests/pkg/constants"
"github.com/konflux-ci/e2e-tests/pkg/utils"
corev1 "k8s.io/api/core/v1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/clients/gitops/controller.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gitops

import (
kubeCl "github.com/redhat-appstudio/e2e-tests/pkg/clients/kubernetes"
kubeCl "github.com/konflux-ci/e2e-tests/pkg/clients/kubernetes"
)

// Factory to initialize the communication against different APIs like kubernetes.
Expand Down
2 changes: 1 addition & 1 deletion pkg/clients/gitops/deploymenttargetclaims.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/konflux-ci/e2e-tests/pkg/logs"
appservice "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/e2e-tests/pkg/logs"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/clients/gitops/deploymenttargetclasses.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/konflux-ci/e2e-tests/pkg/logs"
appservice "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/e2e-tests/pkg/logs"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/clients/gitops/deploymenttargets.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/konflux-ci/e2e-tests/pkg/logs"
appservice "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/e2e-tests/pkg/logs"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/clients/has/applications.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"time"

"github.com/konflux-ci/e2e-tests/pkg/logs"
"github.com/konflux-ci/e2e-tests/pkg/utils"
appservice "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/e2e-tests/pkg/logs"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
Expand Down
4 changes: 2 additions & 2 deletions pkg/clients/has/componentdetectionqueries.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"time"

"github.com/konflux-ci/e2e-tests/pkg/logs"
"github.com/konflux-ci/e2e-tests/pkg/utils"
appservice "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/e2e-tests/pkg/logs"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
rclient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
10 changes: 5 additions & 5 deletions pkg/clients/has/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (
"time"

"github.com/devfile/library/v2/pkg/util"
"github.com/konflux-ci/e2e-tests/pkg/clients/tekton"
"github.com/konflux-ci/e2e-tests/pkg/constants"
"github.com/konflux-ci/e2e-tests/pkg/logs"
"github.com/konflux-ci/e2e-tests/pkg/utils"
"github.com/konflux-ci/e2e-tests/pkg/utils/build"
. "github.com/onsi/ginkgo/v2"
appservice "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/e2e-tests/pkg/clients/tekton"
"github.com/redhat-appstudio/e2e-tests/pkg/constants"
"github.com/redhat-appstudio/e2e-tests/pkg/logs"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
"github.com/redhat-appstudio/e2e-tests/pkg/utils/build"
pipeline "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
8 changes: 4 additions & 4 deletions pkg/clients/has/controller.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package has

import (
"github.com/redhat-appstudio/e2e-tests/pkg/constants"
"github.com/redhat-appstudio/e2e-tests/pkg/utils"
"github.com/konflux-ci/e2e-tests/pkg/constants"
"github.com/konflux-ci/e2e-tests/pkg/utils"

"github.com/redhat-appstudio/e2e-tests/pkg/clients/github"
kubeCl "github.com/redhat-appstudio/e2e-tests/pkg/clients/kubernetes"
"github.com/konflux-ci/e2e-tests/pkg/clients/github"
kubeCl "github.com/konflux-ci/e2e-tests/pkg/clients/kubernetes"
)

// Factory to initialize the comunication against different API like github or kubernetes.
Expand Down
Loading

0 comments on commit d2a9084

Please sign in to comment.