Skip to content

Commit 19fb41e

Browse files
mads-hartmannroboquat
authored andcommitted
Use new dev image with Leeway v0.7.3
1 parent e31984b commit 19fb41e

15 files changed

+286
-287
lines changed

.github/workflows/poc-build.yml

Lines changed: 193 additions & 194 deletions
Large diffs are not rendered by default.

.gitpod.yml

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
1-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-hartmann-don-t-store-leeway-15060.0
1+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
22
workspaceLocation: gitpod/gitpod-ws.code-workspace
33
checkoutLocation: gitpod
44
ports:
5-
- port: 1337
6-
onOpen: open-preview
7-
- port: 3000
8-
onOpen: ignore
9-
- port: 3001
10-
onOpen: ignore
11-
- port: 3306
12-
onOpen: ignore
13-
- port: 4000
14-
onOpen: ignore
15-
# VNC
16-
- port: 5900
17-
onOpen: ignore
18-
# noVNC
19-
- port: 6080
20-
onOpen: ignore
21-
# Werft
22-
- port: 7777
23-
onOpen: ignore
24-
- port: 9229
25-
onOpen: ignore
26-
# Go proxy
27-
- port: 9999
28-
onOpen: ignore
29-
- port: 13001
30-
onOpen: ignore
31-
# Dev Theia
32-
- port: 13444
33-
# Used when using port-forwarding to SSH to preview environment VMs
34-
- port: 8022
35-
onOpen: ignore
5+
- port: 1337
6+
onOpen: open-preview
7+
- port: 3000
8+
onOpen: ignore
9+
- port: 3001
10+
onOpen: ignore
11+
- port: 3306
12+
onOpen: ignore
13+
- port: 4000
14+
onOpen: ignore
15+
# VNC
16+
- port: 5900
17+
onOpen: ignore
18+
# noVNC
19+
- port: 6080
20+
onOpen: ignore
21+
# Werft
22+
- port: 7777
23+
onOpen: ignore
24+
- port: 9229
25+
onOpen: ignore
26+
# Go proxy
27+
- port: 9999
28+
onOpen: ignore
29+
- port: 13001
30+
onOpen: ignore
31+
# Dev Theia
32+
- port: 13444
33+
# Used when using port-forwarding to SSH to preview environment VMs
34+
- port: 8022
35+
onOpen: ignore
3636
tasks:
37-
- name: Remove GCP_ADC_FILE
38-
command: |
39-
if [[ -n "${GCP_ADC_FILE}" ]]; then
40-
echo "$GCP_ADC_FILE" > "/home/gitpod/.config/gcloud/application_default_credentials.json"
41-
yes | gcloud auth application-default revoke
42-
gp env -u GCP_ADC_FILE
43-
fi
44-
exit 0
45-
# This task takes care of configuring your workspace so it can manage and interact
46-
# with preview environments.
47-
- name: Preview environment configuration
48-
init: leeway run dev/preview/previewctl:install
49-
command: INSTALL_CONTEXT=true leeway run dev/preview:configure-workspace
50-
- name: Installer dependencies
51-
init: |
52-
(cd install/installer && make deps)
53-
exit 0
54-
- name: Java
55-
init: leeway run components/supervisor-api:generate-java
56-
command: |
57-
if [ -z "$RUN_GRADLE_TASK" ]; then
58-
read -r -p "Press enter to continue Java gradle task"
59-
fi
60-
leeway exec --package components/supervisor-api/java:lib --package components/gitpod-protocol/java:lib -- ./gradlew build
61-
leeway exec --package components/ide/jetbrains/backend-plugin:plugin-latest --package components/ide/jetbrains/gateway-plugin:publish-latest --parallel -- ./gradlew buildPlugin
62-
- name: TypeScript
63-
init: yarn --network-timeout 100000 && yarn build
64-
- name: Go
65-
before: pre-commit install --install-hooks
66-
init: |
67-
./components/gitpod-protocol/go/scripts/generate-config.sh
68-
leeway exec --filter-type go -v -- go mod verify
69-
openMode: split-right
37+
- name: Remove GCP_ADC_FILE
38+
command: |
39+
if [[ -n "${GCP_ADC_FILE}" ]]; then
40+
echo "$GCP_ADC_FILE" > "/home/gitpod/.config/gcloud/application_default_credentials.json"
41+
yes | gcloud auth application-default revoke
42+
gp env -u GCP_ADC_FILE
43+
fi
44+
exit 0
45+
# This task takes care of configuring your workspace so it can manage and interact
46+
# with preview environments.
47+
- name: Preview environment configuration
48+
init: leeway run dev/preview/previewctl:install
49+
command: INSTALL_CONTEXT=true leeway run dev/preview:configure-workspace
50+
- name: Installer dependencies
51+
init: |
52+
(cd install/installer && make deps)
53+
exit 0
54+
- name: Java
55+
init: leeway run components/supervisor-api:generate-java
56+
command: |
57+
if [ -z "$RUN_GRADLE_TASK" ]; then
58+
read -r -p "Press enter to continue Java gradle task"
59+
fi
60+
leeway exec --package components/supervisor-api/java:lib --package components/gitpod-protocol/java:lib -- ./gradlew build
61+
leeway exec --package components/ide/jetbrains/backend-plugin:plugin-latest --package components/ide/jetbrains/gateway-plugin:publish-latest --parallel -- ./gradlew buildPlugin
62+
- name: TypeScript
63+
init: yarn --network-timeout 100000 && yarn build
64+
- name: Go
65+
before: pre-commit install --install-hooks
66+
init: |
67+
./components/gitpod-protocol/go/scripts/generate-config.sh
68+
leeway exec --filter-type go -v -- go mod verify
69+
openMode: split-right
7070
vscode:
71-
extensions:
72-
- EditorConfig.EditorConfig
73-
- golang.go
74-
- hashicorp.terraform
75-
- ms-azuretools.vscode-docker
76-
- ms-kubernetes-tools.vscode-kubernetes-tools
77-
- stkb.rewrap
78-
- zxh404.vscode-proto3
79-
- matthewpi.caddyfile-support
80-
- heptio.jsonnet
81-
- timonwong.shellcheck
82-
- fwcd.kotlin
83-
- dbaeumer.vscode-eslint
84-
- esbenp.prettier-vscode
85-
- akosyakov.gitpod-monitor
71+
extensions:
72+
- EditorConfig.EditorConfig
73+
- golang.go
74+
- hashicorp.terraform
75+
- ms-azuretools.vscode-docker
76+
- ms-kubernetes-tools.vscode-kubernetes-tools
77+
- stkb.rewrap
78+
- zxh404.vscode-proto3
79+
- matthewpi.caddyfile-support
80+
- heptio.jsonnet
81+
- timonwong.shellcheck
82+
- fwcd.kotlin
83+
- dbaeumer.vscode-eslint
84+
- esbenp.prettier-vscode
85+
- akosyakov.gitpod-monitor

.werft/aks-installer-tests.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

.werft/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pod:
7070
- name: MYSQL_TCP_PORT
7171
value: 23306
7272
- name: build
73-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-hartmann-don-t-store-leeway-15060.0
73+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
7474
workingDir: /workspace
7575
imagePullPolicy: IfNotPresent
7676
resources:

.werft/cleanup-installer-tests.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
28+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
2929
workingDir: /workspace
3030
imagePullPolicy: Always
3131
volumeMounts:

.werft/debug.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
57+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
5858
workingDir: /workspace
5959
imagePullPolicy: IfNotPresent
6060
volumeMounts:

.werft/eks-installer-tests.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

.werft/gke-installer-tests.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

.werft/ide-integration-tests-startup.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
20+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
2121
workingDir: /workspace
2222
imagePullPolicy: IfNotPresent
2323
env:

.werft/k3s-installer-tests.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

.werft/platform-delete-preview-environment.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
28+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
2929
workingDir: /workspace
3030
imagePullPolicy: IfNotPresent
3131
volumeMounts:

.werft/platform-delete-preview-environments-cron.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
32+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
3333
workingDir: /workspace
3434
imagePullPolicy: IfNotPresent
3535
volumeMounts:

.werft/platform-trigger-artificial-job.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
27+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
2828
workingDir: /workspace
2929
imagePullPolicy: IfNotPresent
3030
volumeMounts:

.werft/platform-trigger-werft-cleanup.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
25+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
2626
workingDir: /workspace
2727
imagePullPolicy: IfNotPresent
2828
volumeMounts:

.werft/workspace-run-integration-tests.yaml

Lines changed: 1 addition & 1 deletion
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:mads-hartmann-don-t-store-leeway-15060.0
25+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
2626
workingDir: /workspace
2727
imagePullPolicy: IfNotPresent
2828
env:

0 commit comments

Comments
 (0)