Skip to content

Commit 4c43e22

Browse files
committed
test: replace bb server to bb data center in test config
this replaces name from server to data center in e2e test config. Signed-off-by: Zaki Shaikh <zashaikh@redhat.com>
1 parent 0f22da7 commit 4c43e22

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

.github/workflows/e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
111111
TEST_BITBUCKET_CLOUD_USER: cboudjna
112112

113-
# Bitbucket Server
113+
# Bitbucket Data Center
114114
TEST_BITBUCKET_DATA_CENTER_API_URL: ${{ secrets.BITBUCKET_DATA_CENTER_API_URL }}
115115
TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY: PAC/pac-e2e-tests
116116
TEST_BITBUCKET_DATA_CENTER_TOKEN: ${{ secrets.BITBUCKET_DATA_CENTER_TOKEN }}
@@ -296,7 +296,7 @@ jobs:
296296
TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
297297
TEST_BITBUCKET_CLOUD_USER: cboudjna
298298

299-
# Bitbucket Server
299+
# Bitbucket Data Center
300300
TEST_BITBUCKET_DATA_CENTER_API_URL: ${{ secrets.BITBUCKET_DATA_CENTER_API_URL }}
301301
TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY: PAC/pac-e2e-tests
302302
TEST_BITBUCKET_DATA_CENTER_TOKEN: ${{ secrets.BITBUCKET_DATA_CENTER_TOKEN }}

docs/content/docs/providers/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ Configure Pipelines-as-Code with your Git provider: GitHub, GitLab, Bitbucket, o
1212
{{< card link="github-webhook" title="GitHub Webhook" subtitle="Webhook-based GitHub setup" >}}
1313
{{< card link="gitlab" title="GitLab" subtitle="GitLab.com and self-hosted" >}}
1414
{{< card link="bitbucket-cloud" title="Bitbucket Cloud" subtitle="Bitbucket.org" >}}
15-
{{< card link="bitbucket-datacenter" title="Bitbucket Data Center" subtitle="Self-hosted Bitbucket Server" >}}
15+
{{< card link="bitbucket-datacenter" title="Bitbucket Data Center" subtitle="Self-hosted Bitbucket Data Center" >}}
1616
{{< card link="forgejo" title="Forgejo" subtitle="Forgejo and Gitea" >}}
1717
{{< /cards >}}

docs/content/docs/providers/bitbucket-datacenter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Bitbucket Data Center
33
weight: 5
44
---
55

6-
This page covers how to configure Pipelines-as-Code with [Bitbucket Data Center](https://www.atlassian.com/software/bitbucket/enterprise). Use this method when your organization runs a self-hosted Bitbucket Server or Data Center instance.
6+
This page covers how to configure Pipelines-as-Code with [Bitbucket Data Center](https://www.atlassian.com/software/bitbucket/enterprise). Use this method when your organization runs a self-hosted Bitbucket Data Center instance.
77

88
## Prerequisites
99

pkg/pipelineascode/client_setup_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -605,16 +605,16 @@ func TestSetupAuthenticatedClientProviderSpecificEvents(t *testing.T) {
605605
description: "Bitbucket Cloud PR events should work",
606606
},
607607
{
608-
name: "Bitbucket Server PR opened",
608+
name: "Bitbucket Data Center PR opened",
609609
eventType: "pr:opened",
610610
wantErr: false,
611-
description: "Bitbucket Server PR opened events should work",
611+
description: "Bitbucket Data Center PR opened events should work",
612612
},
613613
{
614-
name: "Bitbucket Server push",
614+
name: "Bitbucket Data Center push",
615615
eventType: "repo:refs_changed",
616616
wantErr: false,
617-
description: "Bitbucket Server push events should work",
617+
description: "Bitbucket Data Center push events should work",
618618
},
619619
}
620620

test/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ cp test/e2e-config.yaml.example test/e2e-config.yaml
8383

8484
The YAML file groups settings by provider section (`common`, `github`,
8585
`github_enterprise`, `gitlab`, `gitea`, `bitbucket_cloud`,
86-
`bitbucket_server`). See `test/e2e-config.yaml.example` for the full list of
86+
`bitbucket_datacenter`). See `test/e2e-config.yaml.example` for the full list of
8787
fields.
8888

8989
Environment variables always take precedence over YAML values, so you can use

test/e2e-config.yaml.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ bitbucket_cloud:
7676
# Format: workspace/repo
7777
e2e_repository: ""
7878

79-
# Bitbucket Data Center (Server)
80-
bitbucket_server:
79+
# Bitbucket Data Center
80+
bitbucket_datacenter:
8181
api_url: ""
8282
user: ""
8383
token: ""

test/pkg/configfile/config.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
)
1010

1111
type E2EConfig struct {
12-
Common CommonConfig `json:"common" yaml:"common"`
13-
GitHub GitHubConfig `json:"github" yaml:"github"`
14-
GitHubEnterprise GitHubEnterpriseConfig `json:"github_enterprise" yaml:"github_enterprise"`
15-
GitLab GitLabConfig `json:"gitlab" yaml:"gitlab"`
16-
Gitea GiteaConfig `json:"gitea" yaml:"gitea"`
17-
BitbucketCloud BitbucketCloudConfig `json:"bitbucket_cloud" yaml:"bitbucket_cloud"`
18-
BitbucketServer BitbucketServerConfig `json:"bitbucket_server" yaml:"bitbucket_server"`
12+
Common CommonConfig `json:"common" yaml:"common"`
13+
GitHub GitHubConfig `json:"github" yaml:"github"`
14+
GitHubEnterprise GitHubEnterpriseConfig `json:"github_enterprise" yaml:"github_enterprise"`
15+
GitLab GitLabConfig `json:"gitlab" yaml:"gitlab"`
16+
Gitea GiteaConfig `json:"gitea" yaml:"gitea"`
17+
BitbucketCloud BitbucketCloudConfig `json:"bitbucket_cloud" yaml:"bitbucket_cloud"`
18+
BitbucketDataCenter BitbucketDataCenterConfig `json:"bitbucket_datacenter" yaml:"bitbucket_datacenter"`
1919
}
2020

2121
type CommonConfig struct {
@@ -70,7 +70,7 @@ type BitbucketCloudConfig struct {
7070
E2ERepository string `env:"TEST_BITBUCKET_CLOUD_E2E_REPOSITORY" json:"e2e_repository" yaml:"e2e_repository"`
7171
}
7272

73-
type BitbucketServerConfig struct {
73+
type BitbucketDataCenterConfig struct {
7474
APIURL string `env:"TEST_BITBUCKET_DATA_CENTER_API_URL" json:"api_url" yaml:"api_url"`
7575
User string `env:"TEST_BITBUCKET_DATA_CENTER_USER" json:"user" yaml:"user"`
7676
Token string `env:"TEST_BITBUCKET_DATA_CENTER_TOKEN" json:"token" yaml:"token"`

test/pkg/configfile/config_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,12 @@ bitbucket_cloud:
152152
user: "bbuser"
153153
token: "bb-token"
154154
e2e_repository: "workspace/repo"
155-
bitbucket_server:
155+
bitbucket_datacenter:
156156
api_url: "https://bitbucket.example.com"
157157
user: "bbsuser"
158158
token: "bbs-token"
159159
e2e_repository: "project/repo"
160-
webhook_secret: "bbs-secret"
160+
webhook_secret: "bds-secret"
161161
`
162162
configPath := filepath.Join(t.TempDir(), "config.yaml")
163163
assert.NilError(t, os.WriteFile(configPath, []byte(content), 0o600))
@@ -225,7 +225,7 @@ bitbucket_server:
225225
"TEST_BITBUCKET_DATA_CENTER_USER": "bbsuser",
226226
"TEST_BITBUCKET_DATA_CENTER_TOKEN": "bbs-token",
227227
"TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY": "project/repo",
228-
"TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET": "bbs-secret",
228+
"TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET": "bds-secret",
229229
}
230230

231231
for envVar, expectedVal := range expected {

0 commit comments

Comments
 (0)