fix: update script execution from sh to bash in sonarqube ingress OIDC deploy feature (#38)

Author: kycheng

.tekton/dockerfile/Dockerfile.base

@@ -1,4 +1,4 @@
-FROM docker-mirrors.alauda.cn/library/openjdk:17-jdk-slim
+FROM docker-mirrors.alauda.cn/library/openjdk:26-ea-17-jdk-slim-bookworm
 
 WORKDIR /app
 
@@ -34,4 +34,4 @@ RUN set -eux; \
     ./bin/yq --version && \
     ./bin/kubectl version --client && \
     ./bin/helm version && \
-    jq --version
+    jq --version

testing/Dockerfile

@@ -5,6 +5,8 @@ WORKDIR /app
 COPY . /app
 
 ENV GOPROXY='https://build-nexus.alauda.cn/repository/golang/,direct'
+RUN PWGO_VER=$(grep -oE "playwright-go v\S+" /app/testing/go.mod | sed 's/playwright-go //g') \
+    && go install github.com/playwright-community/playwright-go/cmd/playwright@${PWGO_VER}
 RUN set -eux \
     && mkdir -p /tools/bin && chmod -R 777 /tools/bin \
     && cd /app/testing \
@@ -20,6 +22,9 @@ RUN set -eux \
 COPY --chown=nonroot:nonroot ./chart /app/chart
 COPY --chown=nonroot:nonroot ./testing /app/testing
 COPY --chown=nonroot:nonroot --from=builder /tools/bin/sonarqube-e2e.test /app/bin/sonarqube-e2e.test
+COPY --chown=nonroot:nonroot --from=builder /go/bin/playwright /app/bin/playwright
+
+RUN /app/bin/playwright install chromium --with-deps
 
 WORKDIR /app/testing
 

testing/features/sonarqube-ingress-oidc-deploy.feature

@@ -7,7 +7,7 @@
     @automated
     @priority-high
     @allure.label.case_id:sonarqube-operator-deploy-sso
-    场景: 通过默认配置部署 Sonarqube
+    场景: 部署 Sonarqube 并使用 OIDC 认证
         并且 集群已存在存储类
         并且 命名空间 "testing-sonarqube-sso-operator" 已存在
         并且 已导入 "SonarQube 数据库" 资源: "./testdata/resources/pg-postgresql.yaml"
@@ -18,7 +18,7 @@
         并且 已导入 "pvc" 资源: "./testdata/resources/sonarqube-pvc.yaml"
         并且 执行 "sso 配置" 脚本成功
             | command                                                                                                             |
-            | sh ./scripts/prepare-sso-config.sh '<config.{{.acp.baseUrl}}>' '<config.{{.acp.token}}>' '<config.{{.acp.cluster}}>' testing-sonarqube-sso-operator http://<node.ip.random.readable>:<nodeport.http> |
+            | bash ./scripts/prepare-sso-config.sh '<config.{{.acp.baseUrl}}>' '<config.{{.acp.token}}>' '<config.{{.acp.cluster}}>' testing-sonarqube-sso-operator http://<node.ip.random.readable>:<nodeport.http> |
             | mkdir -p output/images                                                                                                   |
         当 已导入 "sonarqube 实例" 资源
             """

testing/steps/sso.go

@@ -107,7 +107,7 @@ func process(ctx context.Context, ssoParams ssoParams) (ctx2 context.Context, er
 	}
 
 	if err := loginSonarqube(ctx, page, ssoParams); err != nil {
-		log.Error("Sonarqube 登录失败: %v", zap.Error(err))
+		log.Error("Sonarqube 登录失败: ", zap.Error(err))
 		return ctx, err
 	}
 
@@ -134,7 +134,7 @@ func loginACP(ctx context.Context, page playwright.Page, params ssoParams) error
 	log.Info("等待登录表单出现...")
 	if _, err := page.WaitForSelector(".login-form", playwright.PageWaitForSelectorOptions{
 		State:   playwright.WaitForSelectorStateVisible,
-		Timeout: playwright.Float(30000),
+		Timeout: playwright.Float(60000),
 	}); err != nil {
 		return fmt.Errorf("等待登录表单: %v", err)
 	}
@@ -189,7 +189,7 @@ func loginSonarqube(ctx context.Context, page playwright.Page, params ssoParams)
 			log.Info("等待 Log in with OpenID Connect 按钮出现...")
 			if err := page.Locator("#oauth-providers").WaitFor(playwright.LocatorWaitForOptions{
 				State:   playwright.WaitForSelectorStateVisible,
-				Timeout: playwright.Float(30000),
+				Timeout: playwright.Float(60000),
 			}); err == nil {
 				found = true
 				break
@@ -208,8 +208,10 @@ func loginSonarqube(ctx context.Context, page playwright.Page, params ssoParams)
 
 	// Wait for page load to complete
 	if err := page.WaitForLoadState(playwright.PageWaitForLoadStateOptions{
-		State: playwright.LoadStateNetworkidle,
+		State:   playwright.LoadStateNetworkidle,
+		Timeout: playwright.Float(60000),
 	}); err != nil {
+		log.Error("等待页面加载完成失败", zap.Error(err))
 		return err
 	}