Skip to content

Commit

Permalink
Bug 1299213 - Clean up ui/* now that no submodule is used (#115). r=b…
Browse files Browse the repository at this point in the history
…hearsum
  • Loading branch information
JohanLorenzo authored and bhearsum committed Sep 12, 2016
1 parent 6f35e8c commit ecdf83e
Show file tree
Hide file tree
Showing 19 changed files with 81 additions and 386 deletions.
3 changes: 3 additions & 0 deletions ui/.editorconfig → .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@ insert_final_newline = true
[*.less]
indent_size = 4

[*.py]
indent_size = 4

[*.md]
trim_trailing_whitespace = false
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,11 @@ cef.log
.cache
.tox
*.egg-info

build
generated
dist

ui/node_modules

.DS_Store
32 changes: 29 additions & 3 deletions .taskcluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tasks:
command:
- "/bin/bash"
- "-c"
- "git clone $GITHUB_HEAD_REPO_URL && cd balrog && git checkout $GITHUB_HEAD_BRANCH && bash run-tests.sh"
- "git clone $GITHUB_HEAD_REPO_URL && cd balrog && git checkout $GITHUB_HEAD_BRANCH && bash run-tests.sh backend"
features:
dind: true
extra:
Expand All @@ -23,10 +23,34 @@ tasks:
- pull_request.*
- push
metadata:
name: Balrog Tests
description: Balrog Tests
name: Balrog back-end tests
description: Balrog Python tests
owner: "{{ event.head.user.email }}"
source: "{{ event.head.repo.url }}"

- provisionerId: "{{ taskcluster.docker.provisionerId }}"
workerType: "{{ taskcluster.docker.workerType }}"
payload:
maxRunTime: 1200
image: "rail/python-test-runner"
command:
- "/bin/bash"
- "-c"
- "git clone $GITHUB_HEAD_REPO_URL && cd balrog && git checkout $GITHUB_HEAD_BRANCH && bash run-tests.sh frontend"
features:
dind: true
extra:
github:
env: true
events:
- pull_request.*
- push
metadata:
name: Balrog front-end tests
description: Balrog JavaScript tests
owner: "{{ event.head.user.email }}"
source: "{{ event.head.repo.url }}"

# TODO: make this depend on the test task after https://bugzilla.mozilla.org/show_bug.cgi?id=1252144 is fixed
- provisionerId: "{{ taskcluster.docker.provisionerId }}"
workerType: "{{ taskcluster.docker.workerType }}"
Expand Down Expand Up @@ -54,6 +78,7 @@ tasks:
description: Balrog Docker Image Creation
owner: "{{ event.head.user.email }}"
source: "{{ event.head.repo.url }}"

- provisionerId: "{{ taskcluster.docker.provisionerId }}"
workerType: "{{ taskcluster.docker.workerType }}"
payload:
Expand All @@ -76,6 +101,7 @@ tasks:
description: Balrog Agent Tests
owner: "{{ event.head.user.email }}"
source: "{{ event.head.repo.url }}"

# TODO: make this depend on the test task after https://bugzilla.mozilla.org/show_bug.cgi?id=1252144 is fixed
- provisionerId: "{{ taskcluster.docker.provisionerId }}"
workerType: "{{ taskcluster.docker.workerType }}"
Expand Down
9 changes: 9 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,12 @@ http://127.0.0.1:8080

And you can access the public interface with URLs such as:
http://127.0.0.1:9090/update/3/Firefox/33.0/20141202185629/Darwin_x86_64-gcc3-u-i386-x86_64/en-US/release/default/default/default/update.xml?force=1

You may also want to run all tests available:

./run-tests.sh

If you prefer to run only tests for the front-end or the back-end, you can use:

./run-tests.sh frontend
./run-tests.sh backend
24 changes: 20 additions & 4 deletions scripts/test-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
#!/bin/bash

pip install -r /app/requirements-test.txt
tox $@
run_back_end_tests() {
pip install -r /app/requirements-test.txt
tox $@
}

cd ui/
npm test
run_front_end_tests() {
cd ui/
npm test
}

type_of_tests="$1"

if [[ $type_of_tests == "backend" ]]; then
shift
run_back_end_tests $@
elif [[ $type_of_tests == "frontend" ]]; then
run_front_end_tests
else
run_back_end_tests $@
run_front_end_tests
fi
6 changes: 0 additions & 6 deletions ui/.gitignore

This file was deleted.

7 changes: 0 additions & 7 deletions ui/.npmignore

This file was deleted.

27 changes: 0 additions & 27 deletions ui/.taskcluster.yml

This file was deleted.

40 changes: 0 additions & 40 deletions ui/README.md

This file was deleted.

5 changes: 0 additions & 5 deletions ui/dist/css/app.css

This file was deleted.

Binary file removed ui/dist/favicon.ico
Binary file not shown.
Binary file removed ui/dist/fonts/glyphicons-halflings-regular.eot
Binary file not shown.
Loading

1 comment on commit ecdf83e

@TaskClusterRobot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.