Skip to content

Commit

Permalink
Merge pull request #32 from navendu-pottekkat/update-test-name-and-fi…
Browse files Browse the repository at this point in the history
…x-port-forwarding
  • Loading branch information
pottekkat authored Dec 7, 2021
2 parents 667c85c + 849b53b commit 2f296c5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,5 @@ jobs:
endpoint_url: ${{env.ENDPOINT_URL}}
service_mesh: ${{env.SERVICE_MESH}}
load_generator: ${{ matrix.load-generator }}
profile_name: '${{ matrix.service-mesh }}-${{ matrix.load-generator }}-${{ github.event.inputs.profile_filename }}${{ github.event.inputs.profile_name }}'
profile_name: '${{ matrix.service-mesh }}-${{ matrix.load-generator }}-${{ matrix.test-configuration }}'
test_name: '${{ steps.date.outputs.date }}'
2 changes: 1 addition & 1 deletion .github/workflows/scripts/linkerd_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ linkerd install | kubectl apply -f -
linkerd check

curl -fsL https://run.linkerd.io/emojivoto.yml | kubectl apply -f -
kubectl -n emojivoto port-forward svc/web-svc 8080:80 &
kubectl -n emojivoto port-forward svc/web-svc 8080:80 &> /dev/null &
kubectl get -n emojivoto deploy -o yaml | linkerd inject - | kubectl apply -f -

# Wait for the application to be ready
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/scripts/osm_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ osm install \
kubectl create namespace bookstore
osm namespace add bookstore
kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.11/docs/example/manifests/apps/bookstore.yaml

sleep 100

kubectl get deployments -n bookstore
kubectl get pods -n bookstore

Expand All @@ -36,7 +39,7 @@ if [ -z "$backend" ]; then
fi

POD="$(kubectl get pods --selector app="$backend" -n "$BOOKSTORE_NAMESPACE" --no-headers | grep 'Running' | awk 'NR==1{print $1}')"
kubectl port-forward "$POD" -n "$BOOKSTORE_NAMESPACE" 15000:15000
kubectl port-forward "$POD" -n "$BOOKSTORE_NAMESPACE" 15000:15000 &> /dev/null &

echo "Service Mesh: $MESH_NAME - $SERVICE_MESH"
echo "Endpoint URL: http://localhost:15000"
Expand Down

0 comments on commit 2f296c5

Please sign in to comment.