Skip to content

Commit

Permalink
fix: change package name
Browse files Browse the repository at this point in the history
  • Loading branch information
msvticket committed Feb 4, 2025
1 parent 17174b8 commit ef000db
Show file tree
Hide file tree
Showing 19 changed files with 31 additions and 36 deletions.
11 changes: 3 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ test-single-import:
$(GO) test $(TESTFLAGS) ./test/suite/_import -ginkgo.focus=${BDD_TEST_SINGLE_IMPORT}

testbin:
$(GO) test $(TESTFLAGS) -c github.com/jenkins-x/bdd-jx/test/suite/main -o build/bddjx $(TEST_BUILDFLAGS)
# $(GO) test $(TESTFLAGS) -c github.com/jenkins-x/bdd-jx/test/suite/quickstart -o build/bddjx $(TEST_BUILDFLAGS)
$(GO) test $(TESTFLAGS) -c github.com/jenkins-x/bdd-jx3/test/suite/main -o build/bddjx $(TEST_BUILDFLAGS)
# $(GO) test $(TESTFLAGS) -c github.com/jenkins-x/bdd-jx3/test/suite/quickstart -o build/bddjx $(TEST_BUILDFLAGS)

linux:
GOOS=linux GOARCH=amd64 $(GO) test $(TESTFLAGS) -c github.com/jenkins-x/bdd-jx/test/suite/main -o build/linux/bddjx $(TEST_BUILDFLAGS)
GOOS=linux GOARCH=amd64 $(GO) test $(TESTFLAGS) -c github.com/jenkins-x/bdd-jx3/test/suite/main -o build/linux/bddjx $(TEST_BUILDFLAGS)

bdd-init:
echo "About to run the BDD tests on the current cluster"
Expand All @@ -145,8 +145,3 @@ bdd-init:
bdd: bdd-init $(SUITE)

saas: bdd test-saas

.PHONY: goreleaser
goreleaser:
step-go-releaser --organisation=$(ORG) --revision=$(REV) --branch=$(BRANCH) --build-date=$(BUILD_DATE) --go-version=$(GO_VERSION) --root-package=$(ROOT_PACKAGE) --version=$(VERSION) --timeout 200m

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/jenkins-x/bdd-jx
module github.com/jenkins-x/bdd-jx3

require (
github.com/cenkalti/backoff/v5 v5.0.1
Expand Down
4 changes: 2 additions & 2 deletions test/helpers/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"github.com/onsi/ginkgo/config"
"k8s.io/client-go/kubernetes"

"github.com/jenkins-x/bdd-jx/test/utils"
"github.com/jenkins-x/bdd-jx/test/utils/runner"
"github.com/jenkins-x/bdd-jx3/test/utils"
"github.com/jenkins-x/bdd-jx3/test/utils/runner"

gr "github.com/onsi/ginkgo/reporters"

Expand Down
6 changes: 3 additions & 3 deletions test/helpers/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"k8s.io/apimachinery/pkg/util/rand"

"github.com/cenkalti/backoff/v5"
"github.com/jenkins-x/bdd-jx/test/utils"
"github.com/jenkins-x/bdd-jx/test/utils/parsers"
"github.com/jenkins-x/bdd-jx3/test/utils"
"github.com/jenkins-x/bdd-jx3/test/utils/parsers"
"github.com/onsi/gomega/gexec"

"github.com/jenkins-x/bdd-jx/test/utils/runner"
"github.com/jenkins-x/bdd-jx3/test/utils/runner"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion test/suite/_import/import_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package _import_test
import (
"testing"

"github.com/jenkins-x/bdd-jx/test/helpers"
"github.com/jenkins-x/bdd-jx3/test/helpers"

. "github.com/onsi/ginkgo"
)
Expand Down
4 changes: 2 additions & 2 deletions test/suite/_import/jx_import.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strconv"
"strings"

"github.com/jenkins-x/bdd-jx/test/helpers"
"github.com/jenkins-x/bdd-jx/test/utils"
"github.com/jenkins-x/bdd-jx3/test/helpers"
"github.com/jenkins-x/bdd-jx3/test/utils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
git "gopkg.in/src-d/go-git.v4"
Expand Down
6 changes: 3 additions & 3 deletions test/suite/main/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import (
"os"
"testing"

"github.com/jenkins-x/bdd-jx/test/helpers"
"github.com/jenkins-x/bdd-jx3/test/helpers"

. "github.com/onsi/ginkgo"

// lets import the tests
_ "github.com/jenkins-x/bdd-jx/test/suite/quickstart"
_ "github.com/jenkins-x/bdd-jx3/test/suite/quickstart"
// lets import the tests
_ "github.com/jenkins-x/bdd-jx/test/suite/spring"
_ "github.com/jenkins-x/bdd-jx3/test/suite/spring"
)

// TestSuite runs one or more tests using environment variables to define the tests to run
Expand Down
4 changes: 2 additions & 2 deletions test/suite/quickstart/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (

"github.com/jenkins-x/jx-helpers/v3/pkg/termcolor"

"github.com/jenkins-x/bdd-jx/test/helpers"
"github.com/jenkins-x/bdd-jx3/test/helpers"

"github.com/jenkins-x/bdd-jx/test/utils"
"github.com/jenkins-x/bdd-jx3/test/utils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion test/suite/quickstart/quickstart_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package quickstart_test
import (
"testing"

"github.com/jenkins-x/bdd-jx/test/helpers"
"github.com/jenkins-x/bdd-jx3/test/helpers"

. "github.com/onsi/ginkgo"
)
Expand Down
2 changes: 1 addition & 1 deletion test/suite/spring/helpers.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package spring

import (
"github.com/jenkins-x/bdd-jx/test/helpers"
"github.com/jenkins-x/bdd-jx3/test/helpers"
)

type SpringTestOptions struct {
Expand Down
4 changes: 2 additions & 2 deletions test/suite/spring/jx_create_spring.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strconv"
"strings"

"github.com/jenkins-x/bdd-jx/test/helpers"
"github.com/jenkins-x/bdd-jx3/test/helpers"

"github.com/jenkins-x/bdd-jx/test/utils"
"github.com/jenkins-x/bdd-jx3/test/utils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion test/suite/spring/spring_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package spring_test
import (
"testing"

"github.com/jenkins-x/bdd-jx/test/helpers"
"github.com/jenkins-x/bdd-jx3/test/helpers"

. "github.com/onsi/ginkgo"
)
Expand Down
2 changes: 1 addition & 1 deletion test/suite/step/helpers.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package step

import (
"github.com/jenkins-x/bdd-jx/test/helpers"
"github.com/jenkins-x/bdd-jx3/test/helpers"
)

type StepTestOptions struct {
Expand Down
6 changes: 3 additions & 3 deletions test/suite/step/jx_step_verify_pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"strconv"
"strings"

"github.com/jenkins-x/bdd-jx/test/helpers"
"github.com/jenkins-x/bdd-jx/test/utils"
"github.com/jenkins-x/bdd-jx/test/utils/runner"
"github.com/jenkins-x/bdd-jx3/test/helpers"
"github.com/jenkins-x/bdd-jx3/test/utils"
"github.com/jenkins-x/bdd-jx3/test/utils/runner"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion test/suite/step/step_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package step_test
import (
"testing"

"github.com/jenkins-x/bdd-jx/test/helpers"
"github.com/jenkins-x/bdd-jx3/test/helpers"

. "github.com/onsi/ginkgo"
)
Expand Down
2 changes: 1 addition & 1 deletion test/utils/parsers/get_activities_parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

"github.com/jenkins-x/bdd-jx/test/utils/parsers"
"github.com/jenkins-x/bdd-jx3/test/utils/parsers"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion test/utils/parsers/get_appplications_parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package parsers_test
import (
"testing"

"github.com/jenkins-x/bdd-jx/test/utils/parsers"
"github.com/jenkins-x/bdd-jx3/test/utils/parsers"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion test/utils/runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"
"time"

"github.com/jenkins-x/bdd-jx/test/utils"
"github.com/jenkins-x/bdd-jx3/test/utils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"
Expand Down
2 changes: 1 addition & 1 deletion test/utils/runner/runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package runner_test
import (
"testing"

"github.com/jenkins-x/bdd-jx/test/utils/runner"
"github.com/jenkins-x/bdd-jx3/test/utils/runner"
"github.com/stretchr/testify/assert"
)

Expand Down

0 comments on commit ef000db

Please sign in to comment.