Skip to content

Commit

Permalink
attempt pooling image build
Browse files Browse the repository at this point in the history
  • Loading branch information
mickmis committed Apr 17, 2024
1 parent e447c3a commit ec91154
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 12 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,36 @@ jobs:
- name: Shell lint
run: make shell-lint

build-monitoring:
runs-on: ubuntu-latest
name: Build interuss/monitoring docker image
steps:
- name: Job information
run: |
echo "Job information"
echo "Trigger: ${{ github.event_name }}"
echo "Host: ${{ runner.os }}"
echo "Repository: ${{ github.repository }}"
echo "Branch: ${{ github.ref }}"
docker images
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true
- name: Build and export interuss/monitoring docker image
run: |
cd monitoring
make image
docker save --output monitoring-docker-image.tar interuss/monitoring
- name: Upload interuss/monitoring docker image as artifact
uses: actions/upload-artifact@v3
with:
name: monitoring-docker-image
path: monitoring/monitoring-docker-image.tar

mock_uss-test:
name: mock_uss tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: mock_uss
Expand All @@ -41,6 +69,7 @@ jobs:
uss_qualifier-noop-test:
name: uss_qualifier configurations.dev.noop tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: uss_qualifier-noop-test
Expand All @@ -52,6 +81,7 @@ jobs:
uss_qualifier-geoawareness_cis-test:
name: uss_qualifier configurations.dev.geoawareness_cis tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: uss_qualifier-geoawareness_cis-test
Expand All @@ -63,6 +93,7 @@ jobs:
uss_qualifier-generate_rid_test_data-test:
name: uss_qualifier configurations.dev.generate_rid_test_data tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: uss_qualifier-generate_rid_test_data-test
Expand All @@ -74,6 +105,7 @@ jobs:
uss_qualifier-geospatial_comprehension-test:
name: uss_qualifier configurations.dev.geospatial_comprehension tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: uss_qualifier-geospatial_comprehension-test
Expand All @@ -85,6 +117,7 @@ jobs:
uss_qualifier-general_flight_auth-test:
name: uss_qualifier configurations.dev.general_flight_auth tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: uss_qualifier-general_flight_auth-test
Expand All @@ -96,6 +129,7 @@ jobs:
uss_qualifier-message_signing-test:
name: uss_qualifier configurations.dev.message_signing tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: uss_qualifier-message_signing-test
Expand All @@ -107,6 +141,7 @@ jobs:
uss_qualifier-dss_probing-test:
name: uss_qualifier configurations.dev.dss_probing tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: uss_qualifier-dss_probing-test
Expand All @@ -118,6 +153,7 @@ jobs:
uss_qualifier-f3548_self_contained-test:
name: uss_qualifier configurations.dev.f3548_self_contained tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: uss_qualifier-f3548_self_contained-test
Expand All @@ -129,6 +165,7 @@ jobs:
uss_qualifier-netrid_v22a-test:
name: uss_qualifier configurations.dev.netrid_v22a tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: uss_qualifier-netrid_v22a-test
Expand All @@ -140,6 +177,7 @@ jobs:
uss_qualifier-netrid_v19-test:
name: uss_qualifier configurations.dev.netrid_v19 tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: uss_qualifier-netrid_v19-test
Expand All @@ -151,6 +189,7 @@ jobs:
uss_qualifier-uspace-test:
name: uss_qualifier configurations.dev.uspace tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: uss_qualifier-uspace-test
Expand All @@ -162,6 +201,7 @@ jobs:
prober-test:
name: prober tests
needs: build-monitoring
uses: ./.github/workflows/monitoring-test.yml
with:
name: prober
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/monitoring-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
required: true
type: string

# todo dependency on job

jobs:
monitoring-test:
runs-on: ubuntu-latest
Expand All @@ -29,6 +31,13 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
- name: Download interuss/monitoring docker image as artifact
uses: actions/download-artifact@v3
with:
name: monitoring-docker-image
path: monitoring-docker-image.tar
- name: Import interuss/monitoring docker image
run: docker import monitoring-docker-image.tar
- name: Run ${{ inputs.name }} test
run: ${{ inputs.script }}
- name: Save containers and tracer logs as artifact
Expand Down
9 changes: 5 additions & 4 deletions monitoring/mock_uss/run_locally_test_geoawareness.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ else
fi
cd "${BASEDIR}/../.." || exit 1

(
cd monitoring || exit 1
make image
)
# TODO: temporarly disabled for CI import artifact
#(
#cd monitoring || exit 1
#make image
#)

PUBLIC_KEY="/var/test-certs/auth2.pem"
container_name="mock_uss_geoawareness_test"
Expand Down
9 changes: 5 additions & 4 deletions monitoring/prober/run_locally.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ else
fi
cd "${BASEDIR}/../.." || exit 1

(
cd monitoring || exit 1
make image
)
# TODO: temporarly disabled for CI import artifact
#(
#cd monitoring || exit 1
#make image
#)

CORE_SERVICE_CONTAINER="local_infra-dss-1"
OAUTH_CONTAINER="local_infra-oauth-1"
Expand Down
9 changes: 5 additions & 4 deletions monitoring/uss_qualifier/run_locally.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ else
fi
cd "${BASEDIR}/../.." || exit 1

(
cd monitoring || exit 1
make image
)
# TODO: temporarly disabled for CI import artifact
#(
#cd monitoring || exit 1
#make image
#)

CONFIG_NAME="${1:-ALL}"

Expand Down

0 comments on commit ec91154

Please sign in to comment.