Skip to content

Commit 9c16c4c

Browse files
vulkoingimvulkoingim
committed
Fix previewctl get-name and update image
1 parent aba04a0 commit 9c16c4c

17 files changed

+21
-17
lines changed

Diff for: ‎.gitpod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
1+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
22
workspaceLocation: gitpod/gitpod-ws.code-workspace
33
checkoutLocation: gitpod
44
ports:

Diff for: ‎.werft/aks-installer-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

Diff for: ‎.werft/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pod:
7676
- name: MYSQL_TCP_PORT
7777
value: 23306
7878
- name: build
79-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
79+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
8080
workingDir: /workspace
8181
imagePullPolicy: IfNotPresent
8282
resources:

Diff for: ‎.werft/cleanup-installer-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pod:
2525
secretName: aks-credentials
2626
containers:
2727
- name: nightly-test
28-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
28+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
2929
workingDir: /workspace
3030
imagePullPolicy: Always
3131
volumeMounts:

Diff for: ‎.werft/debug.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pod:
5454
- name: MYSQL_TCP_PORT
5555
value: 23306
5656
- name: build
57-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
57+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
5858
workingDir: /workspace
5959
imagePullPolicy: IfNotPresent
6060
volumeMounts:

Diff for: ‎.werft/eks-installer-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

Diff for: ‎.werft/gke-installer-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

Diff for: ‎.werft/ide-integration-tests-startup.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pod:
1717
secretName: github-token-gitpod-bot
1818
containers:
1919
- name: gcloud
20-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
20+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
2121
workingDir: /workspace
2222
imagePullPolicy: IfNotPresent
2323
env:

Diff for: ‎.werft/k3s-installer-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

Diff for: ‎.werft/platform-delete-preview-environment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pod:
2525
secretName: harvester-vm-ssh-keys
2626
containers:
2727
- name: build
28-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
28+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
2929
workingDir: /workspace
3030
imagePullPolicy: IfNotPresent
3131
volumeMounts:

Diff for: ‎.werft/platform-delete-preview-environments-cron.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pod:
2929
secretName: github-token-gitpod-bot
3030
containers:
3131
- name: build
32-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
32+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
3333
workingDir: /workspace
3434
imagePullPolicy: IfNotPresent
3535
volumeMounts:

Diff for: ‎.werft/platform-trigger-artificial-job.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pod:
2424
secretName: github-token-gitpod-bot
2525
containers:
2626
- name: build
27-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
27+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
2828
workingDir: /workspace
2929
imagePullPolicy: IfNotPresent
3030
volumeMounts:

Diff for: ‎.werft/platform-trigger-werft-cleanup.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pod:
2222
secretName: gcp-sa-gitpod-dev-deployer
2323
containers:
2424
- name: build
25-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
25+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
2626
workingDir: /workspace
2727
imagePullPolicy: IfNotPresent
2828
volumeMounts:

Diff for: ‎.werft/workspace-run-integration-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pod:
2222
secretName: github-token-gitpod-bot
2323
containers:
2424
- name: gcloud
25-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-previewctl-fix-rebuild.6
25+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aa-fix-previewctl-get-name.0
2626
workingDir: /workspace
2727
imagePullPolicy: IfNotPresent
2828
env:

Diff for: ‎dev/image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
FROM gitpod/workspace-full:2022-10-15-02-50-27
66

7-
ENV TRIGGER_REBUILD 23
7+
ENV TRIGGER_REBUILD 24
88

99
USER root
1010

Diff for: ‎dev/preview/previewctl/pkg/preview/preview.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ func New(branch string, logger *logrus.Logger) (*Preview, error) {
4646
return nil, err
4747
}
4848

49-
branch = strings.TrimRight(branch, "\n")
50-
5149
logEntry := logger.WithFields(logrus.Fields{"branch": branch})
5250

5351
harvesterConfig, err := k8s.NewFromDefaultConfigWithContext(logEntry.Logger, harvesterContextName)
@@ -191,6 +189,7 @@ func GetName(branch string) (string, error) {
191189
}
192190
}
193191

192+
branch = strings.TrimSpace(branch)
194193
withoutRefsHead := strings.Replace(branch, "/refs/heads/", "", 1)
195194
lowerCased := strings.ToLower(withoutRefsHead)
196195

Diff for: ‎dev/preview/previewctl/pkg/preview/preview_test.go

+5
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ func TestGetPreviewName(t *testing.T) {
4242
branch: "/refs/heads/this-is-a-long-branch-that-should-be-replaced-with-a-hash",
4343
expectedResult: "this-is-a-a868caa3c3",
4444
},
45+
{
46+
testName: "Branch with whitespace",
47+
branch: "/refs/heads/jetbrains/backend-plugin-platform-2 ",
48+
expectedResult: "jetbrains-35a989462b",
49+
},
4550
}
4651

4752
for _, tc := range testCases {

0 commit comments

Comments
 (0)