Skip to content

Commit da898e1

Browse files
author
EvaBardou
committed
Fix CI
1 parent 969bbf0 commit da898e1

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

.taskcluster.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -291,17 +291,11 @@ tasks:
291291
privileged: true
292292
maxRunTime: 3600
293293
image: "${taskboot_image}"
294-
env:
295-
GIT_REPOSITORY: ${repository}
296-
GIT_REVISION: ${head_rev}
297294
command:
298-
- bash
299-
- backend/build.sh
300-
- "${head_rev}"
301-
- "${head_branch}"
302-
- "${repository}"
303-
- "${taskcluster_root_url}/tasks/{$eval: as_slugid('backend_build')}"
304-
- "${channel}"
295+
- /bin/sh
296+
- -lxce
297+
- "git clone --quiet ${repository} /code-review && cd /code-review && git checkout ${head_rev} -b build &&
298+
/bin/sh backend/build.sh ${head_rev} ${head_branch} ${repository} ${channel}"
305299
artifacts:
306300
public/code-review-backend.tar:
307301
expires: {$fromNow: '2 weeks'}

backend/build.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
#!/bin/bash
2-
1+
#!/bin/sh
32
COMMIT_SHA=$1
43
VERSION=$2
54
SOURCE=$3
6-
BUILD_URL=$4
7-
CHANNEL=$5
5+
CHANNEL=$4
86

9-
# create a version.json per https://github.com/mozilla-services/Dockerflow/blob/master/docs/version_object.md
7+
# Create a version.json per https://github.com/mozilla-services/Dockerflow/blob/master/docs/version_object.md
108
printf '{"commit": "%s", "version": "%s", "source": "%s", "build": "%s"}\n' \
119
"$COMMIT_SHA" \
1210
"$VERSION" \
1311
"$SOURCE" \
14-
"$BUILD_URL" > backend/code_review_backend/version.json
12+
"${TASKCLUSTER_ROOT_URL}/tasks/${TASK_ID}" > backend/code_review_backend/version.json
1513

16-
taskboot build --image mozilla/code-review --tag "$CHANNEL" --tag "$COMMIT_SHA" --write /backend.tar backend/Dockerfile
14+
taskboot --target /code-review build --image mozilla/code-review --tag "$CHANNEL" --tag "$COMMIT_SHA" --write /backend.tar backend/Dockerfile

0 commit comments

Comments
 (0)