Skip to content

Commit 9079cd5

Browse files
committed
Update dev-environment image
1 parent e4cec22 commit 9079cd5

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-trigger.4
1+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-devtest.5
22
workspaceLocation: gitpod/gitpod-ws.code-workspace
33
checkoutLocation: gitpod
44
ports:

.werft/build.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,12 @@ export async function build(context, version) {
148148

149149
// Configure codecov as docker: SOURCE_BRANCH, SOURCE_COMMIT, DOCKER_REPO
150150
// (there is no support for werft)
151-
// -N commit SHA of the parent
152-
// -s
151+
// --parent The commit SHA of the parent for which you are uploading coverage
152+
// --dir Directory to search for coverage reports
153153
werft.phase('coverage', 'uploading code coverage to codecov');
154-
const commit = exec(`git rev-parse HEAD`, { silent: true }).stdout.trim();
155154
const parent_commit = exec(`git rev-parse HEAD^`, { silent: true }).stdout.trim();;
156-
const branch = context.Repository.ref.replace('refs/heads/','');
157155
try {
158-
exec(`set -x;curl -s https://codecov.io/bash | SOURCE_BRANCH=${branch} SOURCE_COMMIT=${commit} DOCKER_REPO=gitpod-io/gitpod bash -s - -N "${parent_commit}" -s "${coverageOutput}"`);
156+
exec(`codecov -N "${parent_commit}" --dir "${coverageOutput}"`);
159157
werft.done('coverage');
160158
} catch (err) {
161159
werft.fail('coverage', err);

.werft/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pod:
3030
- name: MYSQL_TCP_PORT
3131
value: 23306
3232
- name: build
33-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-trigger.4
33+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-devtest.5
3434
workingDir: /workspace
3535
imagePullPolicy: Always
3636
volumeMounts:

.werft/run-integration-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pod:
2222
emptyDir: {}
2323
initContainers:
2424
- name: gcloud
25-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-trigger.4
25+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-devtest.5
2626
workingDir: /workspace
2727
imagePullPolicy: Always
2828
volumeMounts:

.werft/wipe-devstaging.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pod:
1414
secretName: gcp-sa-gitpod-dev-deployer
1515
containers:
1616
- name: wipe-devstaging
17-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-trigger.4
17+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-devtest.5
1818
workingDir: /workspace
1919
imagePullPolicy: Always
2020
volumeMounts:

components/gitpod-protocol/go/gitpod-config_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestGitpodConfig(t *testing.T) {
2424
{
2525
Desc: "parsing",
2626
Content: `
27-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-trigger.4
27+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-devtest.5
2828
workspaceLocation: gitpod/gitpod-ws.code-workspace
2929
checkoutLocation: gitpod
3030
ports:
@@ -43,7 +43,7 @@ vscode:
4343
- [email protected]:UATTe2sTFfCYWQ3jw4IRsw==
4444
- [email protected]:ZnPmyF/Pb8AIWeCqc83gPw==`,
4545
Expectation: &GitpodConfig{
46-
Image: "eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-trigger.4",
46+
Image: "eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-devtest.5",
4747
WorkspaceLocation: "gitpod/gitpod-ws.code-workspace",
4848
CheckoutLocation: "gitpod",
4949
Ports: []*PortsItems{

0 commit comments

Comments
 (0)