Skip to content

Commit

Permalink
test: use vnext tag image in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jkralik committed May 6, 2023
1 parent c979c14 commit fe774cc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ http-gateway-www:

# standard device
DEVICE_SIMULATOR_NAME := devsim
DEVICE_SIMULATOR_IMG := ghcr.io/iotivity/iotivity-lite/cloud-server-debug:master
DEVICE_SIMULATOR_IMG := ghcr.io/iotivity/iotivity-lite/cloud-server-debug:vnext
# device with /oic/res observable
# note: iotivity-lite runs only grpc-gateway tests and this second device is not started; thus
# the grpc-gateway are expected to succeed with a single non-oic/rec observable device
DEVICE_SIMULATOR_RES_OBSERVABLE_NAME := devsim-resobs
DEVICE_SIMULATOR_RES_OBSERVABLE_IMG := ghcr.io/iotivity/iotivity-lite/cloud-server-discovery-resource-observable-debug:master
DEVICE_SIMULATOR_RES_OBSERVABLE_IMG := ghcr.io/iotivity/iotivity-lite/cloud-server-discovery-resource-observable-debug:vnext

# Pull latest device simulator with given name and run it
#
Expand Down
10 changes: 5 additions & 5 deletions bundle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Provides a simple docker cloud image for **testing purpose**.
### Pull the image

```bash
docker pull plgd/bundle:vnext
docker pull ghcr.io/plgd-dev/hub/bundle:vnext
```

### Configuration
Expand Down Expand Up @@ -60,7 +60,7 @@ All datas, confgurations and logs are stored under /data directory at the contai

```bash
mkdir -p `pwd`/data
docker run -d --network=host -v `pwd`/data:/data --name=cloud -t plgd/bundle:vnext
docker run -d --network=host -v `pwd`/data:/data --name=cloud -t ghcr.io/plgd-dev/hub/bundle:vnext
```

### Access via HTTPS/GRPC
Expand Down Expand Up @@ -88,7 +88,7 @@ The onboarding values which should be set to the [coapcloudconf](https://github.

```bash
# Start the cloud container with "unsecured" parameters
docker run -d --network=host --name=cloud -t plgd/bundle:vnext \
docker run -d --network=host --name=cloud -t ghcr.io/plgd-dev/hub/bundle:vnext \
-e COAP_GATEWAY_CLOUD_ID="00000000-0000-0000-0000-000000000001" \
-e COAP_GATEWAY_UNSECURE_PORT="5683"
```
Expand Down Expand Up @@ -143,7 +143,7 @@ go ob

```bash
# Start the cloud container with "secured" parameters
docker run -d --network=host --name=cloud -t plgd/bundle:vnext \
docker run -d --network=host --name=cloud -t ghcr.io/plgd-dev/hub/bundle:vnext \
-e COAP_GATEWAY_CLOUD_ID="00000000-0000-0000-0000-000000000001" \
-e COAP_GATEWAY_PORT="5684"
```
Expand Down Expand Up @@ -227,7 +227,7 @@ docker run -d --network=host -v `pwd`/data:/data --name=cloud \
-e LOG_DEBUG=true \
-e OPEN_TELEMETRY_EXPORTER_ENABLED=true \
-e OPEN_TELEMETRY_EXPORTER_ADDRESS=<OTEL_COLLECTOR_ADDRESS>:4317 \
-t plgd/bundle:vnext
-t ghcr.io/plgd-dev/hub/bundle:vnext
```

With debug log messages, you can see the open telemetry *traceId* associated with the request.

0 comments on commit fe774cc

Please sign in to comment.