Skip to content

Commit e6f3cb4

Browse files
committed
remove spp-skywalking-reroute header
add spp-platform-request header changed port 5445 to 12800 for live-platform
1 parent 207a270 commit e6f3cb4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ jobs:
4747
- name: Set SPP_PLATFORM_HOST
4848
run: SPP_PLATFORM_HOST=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aqf "name=spp-platform")) && echo "SPP_PLATFORM_HOST=$SPP_PLATFORM_HOST" >> $GITHUB_ENV
4949
- name: Wait for platform
50-
run: until $(curl --insecure --output /dev/null --silent --fail https://localhost:5445/api/new-token?access_token=change-me); do printf '.'; sleep 5; done && SPP_JWT_TOKEN=$(curl --insecure https://localhost:5445/api/new-token?access_token=change-me) && echo "SPP_JWT_TOKEN=$SPP_JWT_TOKEN" >> $GITHUB_ENV
50+
run: until $(curl --insecure --output /dev/null --silent --fail https://localhost:12800/api/new-token?access_token=change-me); do printf '.'; sleep 5; done && SPP_JWT_TOKEN=$(curl --insecure https://localhost:12800/api/new-token?access_token=change-me) && echo "SPP_JWT_TOKEN=$SPP_JWT_TOKEN" >> $GITHUB_ENV
5151
- name: Wait for skywalking
5252
run: |
53-
until $(curl --header "Authorization: Bearer ${{ env.SPP_JWT_TOKEN }}" --insecure --output /dev/null --silent --fail https://localhost:5445/health); do printf '.'; sleep 5; done
53+
until $(curl --header "Authorization: Bearer ${{ env.SPP_JWT_TOKEN }}" --insecure --output /dev/null --silent --fail https://localhost:12800/health); do printf '.'; sleep 5; done
5454
5555
#todo: create health for TraceSegmentServiceClient.statusChanged()
5656
- run: sleep 45s
5757

5858
- name: Verify probe connected
5959
run: |
60-
resp=$(curl --header "Authorization: Bearer ${{ env.SPP_JWT_TOKEN }}" --insecure https://localhost:5445/clients) && [[ $(echo $resp | jq -r ."probes"[0]."meta"."language") == "java" ]] && echo $resp || (echo $resp && exit 1)
60+
resp=$(curl --header "Authorization: Bearer ${{ env.SPP_JWT_TOKEN }}" --insecure https://localhost:12800/clients) && [[ $(echo $resp | jq -r ."probes"[0]."meta"."language") == "java" ]] && echo $resp || (echo $resp && exit 1)
6161
6262
- run: ./gradlew test -Dtest.profile=integration
6363

e2e/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ services:
2020
container_name: spp-platform
2121
hostname: spp-platform
2222
ports:
23-
- "5445:5445"
2423
- "5450:5450"
2524
- "5455:5455"
2625
- "5107:5107"
26+
- "12800:12800"
2727
environment:
2828
- SPP_LOGGING_LEVEL=trace
2929
- SPP_OAP_HOST=skywalking-oap

0 commit comments

Comments
 (0)