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

Use ThirdParty tokens for CI, for compatibility with ROSA-Hosted clusters #146

Merged
merged 1 commit into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
31 changes: 15 additions & 16 deletions test/scripts/openshift-ci/deploy.ossm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -111,25 +111,24 @@ metadata:
name: basic
namespace: istio-system
spec:
version: v2.3
tracing:
type: Jaeger
sampling: 10000
# Uncomment if on ROSA
# security:
# identity:
# type: ThirdParty
addons:
jaeger:
name: jaeger
install:
storage:
type: Memory
grafana:
enabled: false
kiali:
enabled: true
enabled: false
name: kiali
grafana:
enabled: true
prometheus:
enabled: false
jaeger:
name: jaeger
gateways:
openshiftRoute:
enabled: false
security:
identity:
type: ThirdParty
tracing:
type: None
EOF

# Waiting for OSSM minimum start
Expand Down
2 changes: 1 addition & 1 deletion test/scripts/openshift-ci/deploy.serverless.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ waitpodready() {
local podlabel=${1?pod label is required}; shift

waitforpodlabeled "$ns" "$podlabel"
sleep 10
sleep 2
oc get pod -n $ns -l $podlabel

echo "Waiting for pod -l $podlabel to become ready"
Expand Down