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.

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

Replace the project name "Chariott" in code and package names, with the component name "intent brokering" #251

Merged
merged 15 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
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
2 changes: 1 addition & 1 deletion .cargo/config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[env]
DEFAULT_CHARIOTT_URL = "http://0.0.0.0:4243"
DEFAULT_INTENT_BROKER_URL = "http://0.0.0.0:4243"

[target.'cfg(all())']
rustflags = ["-D", "warnings"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/containerize.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Containerize and Push to Container Registry

# Containerizes and pushes a build of the Chariott to a container registry.
# Containerizes and pushes a build of Chariott Intent Brokering to a container registry.
#
# To use this in your own clone of this repo, you need to configure three Github Action secrets:
# 1. CONTAINER_REGISTRY_ENDPOINT: The DNS endpoint of your container registry (eg. sdv.azurecr.io)
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/e2e-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:

env:
CARGO_TERM_COLOR: always
CHARIOTT_REGISTRY_TTL_SECS: 7
INTENT_BROKERING_REGISTRY_TTL_SECS: 7

jobs:
e2e:
Expand All @@ -46,13 +46,13 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Build Chariott Container
- name: Build Intent Brokering service Container
uses: docker/build-push-action@v3
with:
context: .
file: ./Dockerfile.intent_brokering
load: true
tags: chariott:1
tags: intent_brokering:1

- name: Build KV-App Container
uses: docker/build-push-action@v3
Expand All @@ -63,12 +63,12 @@ jobs:
load: true
tags: kv-app:1

- name: Start Chariott
- name: Start Intent Brokering
run: |
docker run -d --name chariott --network host \
docker run -d --name intent_brokering --network host \
-e RUST_LOG=debug \
-e CHARIOTT_REGISTRY_TTL_SECS \
chariott:1
-e INTENT_BROKERING_REGISTRY_TTL_SECS \
intent_brokering:1

- name: Start KV-App
run: |
Expand All @@ -78,17 +78,17 @@ jobs:
run: |
cargo test --test "*e2e"

- name: Print Chariott log output
- name: Print Intent Brokering log output
if: ${{ always() }}
run: |
docker logs chariott > chariott.log
docker logs chariott
docker logs intent_brokering > intent_brokering.log
docker logs intent_brokering

- name: Archive Chariott log output
- name: Archive Intent Brokering log output
uses: actions/upload-artifact@v1
with:
name: Chariott E2E log
path: chariott.log
name: Intent Brokering E2E log
path: intent_brokering.log

- name: Print KV App log output
if: ${{ always() }}
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/lt-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Build chariott container
- name: Build intent brokering container
uses: docker/build-push-action@v3
with:
context: .
file: Dockerfile.intent_brokering
load: true
tags: chariott:1
tags: intent_brokering:1

- name: Build valgrind enabled chariott container
- name: Build valgrind enabled intent brokering container
uses: docker/build-push-action@v3
with:
context: .
file: ./Dockerfile.intent_brokering.valgrind
load: true
tags: val-chariott:1
tags: intent_brokering.valgrind:1

- name: Build lt-provider-app container
uses: docker/build-push-action@v3
Expand All @@ -78,9 +78,9 @@ jobs:
load: true
tags: lt-provider-app:1

- name: Start chariott and lt-provider-app
- name: Start intent_brokering and lt-provider-app
run: |
docker run --init --detach --name chariott --network host chariott:1
docker run --init --detach --name intent_brokering --network host intent_brokering:1
docker run --init --detach --name lt-provider-app --network host lt-provider-app:1

- name: Run load tests
Expand All @@ -92,9 +92,9 @@ jobs:
- name: Stop containers
run: |
docker kill --signal=SIGINT lt-provider-app
docker kill --signal=SIGINT chariott
docker kill --signal=SIGINT intent_brokering
docker stop lt-provider-app
docker stop chariott
docker stop intent_brokering

- name: Print performance numbers
run: |
Expand All @@ -107,21 +107,21 @@ jobs:
- name: Print log output
if: ${{ always() }}
run: |
docker logs chariott
docker logs intent_brokering
docker logs lt-provider-app
for f in lt-output/*.log; do
echo -e "Printing output of file $f:\n"
cat "$f";
done

- name: Start chariott and lt-provider-app
- name: Start intent_brokering and lt-provider-app
run: |
docker rm lt-provider-app
docker rm chariott
docker rm intent_brokering
mkdir -p valgrind-output
sudo chown -R 10001:10001 valgrind-output
sudo chmod -R 777 valgrind-output
docker run --init --detach --name val-chariott --network host --volume $(pwd)/valgrind-output:/output val-chariott:1
docker run --init --detach --name intent_brokering.valgrind --network host --volume $(pwd)/valgrind-output:/output intent_brokering.valgrind:1
docker run --init --detach --name lt-provider-app --network host lt-provider-app:1

- name: Run Memory Profiling using load tests
Expand All @@ -134,9 +134,9 @@ jobs:
- name: Stop containers
run: |
docker kill --signal=SIGINT lt-provider-app
docker kill --signal=SIGINT val-chariott
docker kill --signal=SIGINT intent_brokering.valgrind
docker stop lt-provider-app
docker stop val-chariott
docker stop intent_brokering.valgrind

- name: Create valgrind benchmark report
run: |
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
uses: benchmark-action/github-action-benchmark@v1
if: ${{ github.event_name != 'workflow_dispatch' }}
with:
name: Chariott Benchmark
name: Intent Brokering Benchmark
tool: 'customSmallerIsBetter'
output-file-path: lt-output/all.json
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -181,7 +181,7 @@ jobs:
- name: Print log output
if: ${{ always() }}
run: |
docker logs val-chariott
docker logs intent_brokering.valgrind
docker logs lt-provider-app
for f in lt-output/*.log; do
echo -e "Printing output of file $f:\n"
Expand Down
Loading
Loading