Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Github Workflows #82

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft

Github Workflows #82

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bf76d42
starting workflow?
senkevinli Oct 27, 2020
68bfd37
fixed syntax
senkevinli Oct 27, 2020
f2658da
trying matrix
senkevinli Oct 27, 2020
e4d9210
fixed typo
senkevinli Oct 27, 2020
d9d901d
added testing stage
senkevinli Oct 28, 2020
502c057
fixed typo in ci.yaml
senkevinli Oct 28, 2020
1ea1420
removed tty
senkevinli Oct 28, 2020
1fc815f
pinning aiohttp for now
senkevinli Oct 29, 2020
edf93df
adjusting tty in makefiles
senkevinli Oct 29, 2020
04b0cb6
updating python version
senkevinli Oct 29, 2020
cc752a0
added more tests
senkevinli Oct 29, 2020
05e9042
changing options again
senkevinli Oct 29, 2020
c11a287
changed python environment
senkevinli Oct 29, 2020
28b4b8e
syntax fix
senkevinli Oct 29, 2020
46418fd
factored out tests to jobs
senkevinli Oct 29, 2020
c0ddd6c
fixed syntax again
senkevinli Oct 29, 2020
fd092ba
fixed setup
senkevinli Oct 29, 2020
fe11c05
added another workflow for xavier
senkevinli Jan 11, 2021
4789522
bring in master changes
senkevinli Feb 25, 2021
67a7aa5
fix typo + add image-rec-auto
senkevinli Feb 25, 2021
43d6a0c
it option to image-rec-auto makefile
senkevinli Feb 25, 2021
afb9e42
solve issue with imagery tests
senkevinli Feb 25, 2021
e4428dd
delete prod.yaml + get rid of clean up
senkevinli Feb 28, 2021
aeaec7e
stop redundant checks
senkevinli Feb 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 164 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
name: Orchestra

on: ["push", "pull_request"]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
service: [
mavproxy,
interop-proxy,
telemetry,
pong,
forward-interop,
imagery,
image-rec-master,
image-rec-auto
grafana
]
steps:
- uses: actions/checkout@v2
- name: Building services
run: |
./ci/script.sh
env:
SERVICE: ${{ matrix.service }}
- name: Clean up
run: |
./ci/after-script.sh

test-interop-proxy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-elixir@v1
with:
elixir-version: '1.8'
otp-version: '20'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: interop-proxy
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh

test-telemetry:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-node@v1
with:
node-version: '12'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: telemetry
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh

test-forward-interop:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-node@v1
with:
node-version: '12'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: forward-interop
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh

test-pong:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-node@v1
with:
node-version: '12'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: pong
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh

test-imagery:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-node@v1
with:
node-version: '12'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: imagery
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh

test-image-rec-master:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-python@v2
with:
python-version: '3.8'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: image-rec-master
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh

test-image-rec-auto:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-python@v2
with:
python-version: '3.8'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: image-rec-auto
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh
138 changes: 138 additions & 0 deletions .github/workflows/prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
name: Orchestra

on: ["push", "pull_request"]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
service: [
mavproxy,
interop-proxy,
telemetry,
pong,
forward-interop,
imagery,
image-rec-master,
grafana
]
steps:
- uses: actions/checkout@v2
- name: Building services
run: |
./ci/script.sh
env:
SERVICE: ${{ matrix.service }}
- name: Clean up
run: |
./ci/after-script.sh
test-interop-proxy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-elixir@v1
with:
elixir-version: '1.8'
otp-version: '20'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: interop-proxy
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh
test-telemetry:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-node@v1
with:
node-version: '12'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: telemetry
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh
test-forward-interop:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-node@v1
with:
node-version: '12'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: forward-interop
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh
test-pong:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-node@v1
with:
node-version: '12'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: pong
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh
test-imagery:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-node@v1
with:
node-version: '12'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: imagery
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh
test-image-rec-master:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup environment
uses: actions/setup-python@v2
with:
python-version: '3.8'
- name: Testing service
run: |
./ci/script.sh
env:
SERVICE_TEST: pong
OPTIONS: "-i"
- name: Clean up
run: |
./ci/after-script.sh
2 changes: 2 additions & 0 deletions ci/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#!/bin/sh -ex

echo $SERVICE_TEST
# Build a service if the env var is set.
if [ -n "$SERVICE" ]; then
make "$SERVICE"
fi

# Run tests if specified.
if [ -n "$SERVICE_TEST" ]; then
# Change options for tty
make "$SERVICE_TEST"-test
fi
4 changes: 3 additions & 1 deletion services/forward-interop/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ FORWARD_INTEROP_TEST_IMAGE := uavaustin/forward-interop-test

current_dir := $(shell pwd)

OPTIONS ?= "-it"

.PHONY: all
all: image

Expand All @@ -17,7 +19,7 @@ image:
test:
docker build -t $(FORWARD_INTEROP_TEST_IMAGE) \
-f Dockerfile.test $(DOCKERFLAGS) ..
docker run -it --rm -v $(current_dir)/coverage:/test/coverage \
docker run $(OPTIONS) --rm -v $(current_dir)/coverage:/test/coverage \
$(FORWARD_INTEROP_TEST_IMAGE)

.PHONY: clean
Expand Down
3 changes: 2 additions & 1 deletion services/image-rec-auto/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Flags for docker when building images, meant to be overridden
DOCKERFLAGS :=
JETSON ?= "false"
OPTIONS ?= -it
HAWK_EYE_VERSION := 0.0.2b0

IMAGE_REC_AUTO_IMAGE := uavaustin/image-rec-auto
Expand Down Expand Up @@ -45,7 +46,7 @@ else
--build-arg HAWK_EYE_VERSION=$(HAWK_EYE_VERSION) \
$(DOCKERFLAGS) ..

docker run -it --ipc=host --rm -v $(current_dir)/coverage:/test/coverage \
docker run $(OPTIONS) --ipc=host --rm -v $(current_dir)/coverage:/test/coverage \
$(IMAGE_REC_AUTO_TEST_IMAGE)
endif

Expand Down
Binary file added services/image-rec-auto/coverage/.coverage
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion services/image-rec-master/Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7-alpine
FROM python:3.8-alpine

WORKDIR /test

Expand Down
4 changes: 3 additions & 1 deletion services/image-rec-master/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ IMAGE_REC_MASTER_TEST_IMAGE := uavaustin/image-rec-master-test

current_dir := $(shell pwd)

OPTIONS ?= -it

.PHONY: all
all: image

Expand All @@ -17,7 +19,7 @@ image:
test:
docker build -t $(IMAGE_REC_MASTER_TEST_IMAGE) \
-f Dockerfile.test $(DOCKERFLAGS) ..
docker run -it --rm -v $(current_dir)/coverage:/test/coverage \
docker run $(OPTIONS) --rm -v $(current_dir)/coverage:/test/coverage \
-v /var/run/docker.sock:/var/run/docker.sock \
$(IMAGE_REC_MASTER_TEST_IMAGE)

Expand Down
2 changes: 1 addition & 1 deletion services/image-rec-master/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
aiohttp
aiohttp==3.6.2
aioredis
protobuf>=3.6.1
Loading