Skip to content

Commit ef000db

Browse files
msvticketmsvticket
committed
fix: change package name
related to jenkins-x/jx#8670
1 parent 17174b8 commit ef000db

19 files changed

+31
-36
lines changed

‎Makefile

+3-8
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ test-single-import:
125125
$(GO) test $(TESTFLAGS) ./test/suite/_import -ginkgo.focus=${BDD_TEST_SINGLE_IMPORT}
126126

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

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

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

147147
saas: bdd test-saas
148-
149-
.PHONY: goreleaser
150-
goreleaser:
151-
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
152-

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/jenkins-x/bdd-jx
1+
module github.com/jenkins-x/bdd-jx3
22

33
require (
44
github.com/cenkalti/backoff/v5 v5.0.1

‎test/helpers/suite.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"github.com/onsi/ginkgo/config"
1818
"k8s.io/client-go/kubernetes"
1919

20-
"github.com/jenkins-x/bdd-jx/test/utils"
21-
"github.com/jenkins-x/bdd-jx/test/utils/runner"
20+
"github.com/jenkins-x/bdd-jx3/test/utils"
21+
"github.com/jenkins-x/bdd-jx3/test/utils/runner"
2222

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

‎test/helpers/test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323
"k8s.io/apimachinery/pkg/util/rand"
2424

2525
"github.com/cenkalti/backoff/v5"
26-
"github.com/jenkins-x/bdd-jx/test/utils"
27-
"github.com/jenkins-x/bdd-jx/test/utils/parsers"
26+
"github.com/jenkins-x/bdd-jx3/test/utils"
27+
"github.com/jenkins-x/bdd-jx3/test/utils/parsers"
2828
"github.com/onsi/gomega/gexec"
2929

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

3232
. "github.com/onsi/ginkgo"
3333
. "github.com/onsi/gomega"

‎test/suite/_import/import_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package _import_test
33
import (
44
"testing"
55

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

88
. "github.com/onsi/ginkgo"
99
)

‎test/suite/_import/jx_import.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strconv"
88
"strings"
99

10-
"github.com/jenkins-x/bdd-jx/test/helpers"
11-
"github.com/jenkins-x/bdd-jx/test/utils"
10+
"github.com/jenkins-x/bdd-jx3/test/helpers"
11+
"github.com/jenkins-x/bdd-jx3/test/utils"
1212
. "github.com/onsi/ginkgo"
1313
. "github.com/onsi/gomega"
1414
git "gopkg.in/src-d/go-git.v4"

‎test/suite/main/main_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import (
44
"os"
55
"testing"
66

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

99
. "github.com/onsi/ginkgo"
1010

1111
// lets import the tests
12-
_ "github.com/jenkins-x/bdd-jx/test/suite/quickstart"
12+
_ "github.com/jenkins-x/bdd-jx3/test/suite/quickstart"
1313
// lets import the tests
14-
_ "github.com/jenkins-x/bdd-jx/test/suite/spring"
14+
_ "github.com/jenkins-x/bdd-jx3/test/suite/spring"
1515
)
1616

1717
// TestSuite runs one or more tests using environment variables to define the tests to run

‎test/suite/quickstart/helpers.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

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

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

15-
"github.com/jenkins-x/bdd-jx/test/utils"
15+
"github.com/jenkins-x/bdd-jx3/test/utils"
1616
. "github.com/onsi/ginkgo"
1717
. "github.com/onsi/gomega"
1818
)

‎test/suite/quickstart/quickstart_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package quickstart_test
33
import (
44
"testing"
55

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

88
. "github.com/onsi/ginkgo"
99
)

‎test/suite/spring/helpers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package spring
22

33
import (
4-
"github.com/jenkins-x/bdd-jx/test/helpers"
4+
"github.com/jenkins-x/bdd-jx3/test/helpers"
55
)
66

77
type SpringTestOptions struct {

‎test/suite/spring/jx_create_spring.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"strconv"
77
"strings"
88

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

11-
"github.com/jenkins-x/bdd-jx/test/utils"
11+
"github.com/jenkins-x/bdd-jx3/test/utils"
1212
. "github.com/onsi/ginkgo"
1313
. "github.com/onsi/gomega"
1414
)

‎test/suite/spring/spring_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package spring_test
33
import (
44
"testing"
55

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

88
. "github.com/onsi/ginkgo"
99
)

‎test/suite/step/helpers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package step
22

33
import (
4-
"github.com/jenkins-x/bdd-jx/test/helpers"
4+
"github.com/jenkins-x/bdd-jx3/test/helpers"
55
)
66

77
type StepTestOptions struct {

‎test/suite/step/jx_step_verify_pods.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"strconv"
66
"strings"
77

8-
"github.com/jenkins-x/bdd-jx/test/helpers"
9-
"github.com/jenkins-x/bdd-jx/test/utils"
10-
"github.com/jenkins-x/bdd-jx/test/utils/runner"
8+
"github.com/jenkins-x/bdd-jx3/test/helpers"
9+
"github.com/jenkins-x/bdd-jx3/test/utils"
10+
"github.com/jenkins-x/bdd-jx3/test/utils/runner"
1111
. "github.com/onsi/ginkgo"
1212
. "github.com/onsi/gomega"
1313
)

‎test/suite/step/step_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package step_test
33
import (
44
"testing"
55

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

88
. "github.com/onsi/ginkgo"
99
)

‎test/utils/parsers/get_activities_parser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"strings"
55
"testing"
66

7-
"github.com/jenkins-x/bdd-jx/test/utils/parsers"
7+
"github.com/jenkins-x/bdd-jx3/test/utils/parsers"
88
"github.com/stretchr/testify/assert"
99
)
1010

‎test/utils/parsers/get_appplications_parser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package parsers_test
33
import (
44
"testing"
55

6-
"github.com/jenkins-x/bdd-jx/test/utils/parsers"
6+
"github.com/jenkins-x/bdd-jx3/test/utils/parsers"
77
"github.com/stretchr/testify/assert"
88
)
99

‎test/utils/runner/runner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"testing"
1212
"time"
1313

14-
"github.com/jenkins-x/bdd-jx/test/utils"
14+
"github.com/jenkins-x/bdd-jx3/test/utils"
1515
. "github.com/onsi/ginkgo"
1616
. "github.com/onsi/gomega"
1717
"github.com/onsi/gomega/gexec"

‎test/utils/runner/runner_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package runner_test
33
import (
44
"testing"
55

6-
"github.com/jenkins-x/bdd-jx/test/utils/runner"
6+
"github.com/jenkins-x/bdd-jx3/test/utils/runner"
77
"github.com/stretchr/testify/assert"
88
)
99

0 commit comments

Comments
 (0)