Commit 0cbd10e1 authored by Cai Wei's avatar Cai Wei

fix(ci): 修复ci语法错误

parent 8d75120a
Pipeline #1303 failed
...@@ -42,10 +42,9 @@ build: ...@@ -42,10 +42,9 @@ build:
expire_in: 2 hours expire_in: 2 hours
rules: rules:
- if: $CI_PIPELINE_SOURCE == "web" # 手动触发 - if: $CI_PIPELINE_SOURCE == "web" # 手动触发
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "projects/e2e-demo" # e2e-demo分支触发 - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "projects" # projects分支触发
- if: $CI_PIPELINE_SOURCE == "merge_request_event" # MR触发 - if: $CI_PIPELINE_SOURCE == "merge_request_event" # MR触发
- when: manual # 允许手动触发 - when: manual # 允许手动触发
allow_failure: false
# 基础测试 - 核心功能验证 # 基础测试 - 核心功能验证
cypress-basic-tests: cypress-basic-tests:
...@@ -88,7 +87,7 @@ cypress-basic-tests: ...@@ -88,7 +87,7 @@ cypress-basic-tests:
expire_in: 1 week expire_in: 1 week
rules: rules:
- if: $CI_PIPELINE_SOURCE == "web" - if: $CI_PIPELINE_SOURCE == "web"
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "projects/e2e-demo" - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "projects"
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
# 完整测试套件 - 手动触发 # 完整测试套件 - 手动触发
...@@ -128,7 +127,6 @@ cypress-full-tests: ...@@ -128,7 +127,6 @@ cypress-full-tests:
rules: rules:
- if: $CI_PIPELINE_SOURCE == "web" && $FULL_TEST_SUITE == "true" - if: $CI_PIPELINE_SOURCE == "web" && $FULL_TEST_SUITE == "true"
- when: manual - when: manual
allow_failure: false
# 并行测试组1 - 业务功能模块 # 并行测试组1 - 业务功能模块
cypress-business-tests: cypress-business-tests:
...@@ -259,7 +257,7 @@ generate-test-reports: ...@@ -259,7 +257,7 @@ generate-test-reports:
<div class="container"> <div class="container">
<div class="header"> <div class="header">
<h1>🧪 DC-TOM Cypress 测试报告</h1> <h1>🧪 DC-TOM Cypress 测试报告</h1>
<p><strong>项目:</strong> dctomproject | <strong>分支:</strong> projects/e2e-demo</p> <p><strong>项目:</strong> dctomproject | <strong>分支:</strong> projects</p>
<p><strong>构建时间:</strong> $(date '+%Y-%m-%d %H:%M:%S')</p> <p><strong>构建时间:</strong> $(date '+%Y-%m-%d %H:%M:%S')</p>
</div> </div>
<ul class="links"> <ul class="links">
...@@ -295,7 +293,7 @@ generate-test-reports: ...@@ -295,7 +293,7 @@ generate-test-reports:
expire_in: 1 month expire_in: 1 month
rules: rules:
- if: $CI_PIPELINE_SOURCE == "web" - if: $CI_PIPELINE_SOURCE == "web"
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "projects/e2e-demo" - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "projects"
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
# Pages部署 - 展示测试报告 # Pages部署 - 展示测试报告
...@@ -311,4 +309,4 @@ pages: ...@@ -311,4 +309,4 @@ pages:
expire_in: 1 month expire_in: 1 month
rules: rules:
- if: $CI_PIPELINE_SOURCE == "web" - if: $CI_PIPELINE_SOURCE == "web"
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "projects/e2e-demo" - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "projects"
\ No newline at end of file \ No newline at end of file
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
## 测试策略 ## 测试策略
### 1. 基础测试 (自动触发) ### 1. 基础测试 (自动触发)
- **触发条件**: 推送到 `projects/e2e-demo` 分支、MR、手动触发 - **触发条件**: 推送到 `projects` 分支、MR、手动触发
- **测试范围**: 登录、仪表盘、导航等核心功能 - **测试范围**: 登录、仪表盘、导航等核心功能
- **测试文件**: `{login,dashboard,navigation}.cy.js` - **测试文件**: `{login,dashboard,navigation}.cy.js`
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
## 🔄 触发方式配置 ## 🔄 触发方式配置
### 自动触发 ### 自动触发
- ✅ 推送到 `projects/e2e-demo` 分支 - ✅ 推送到 `projects` 分支
- ✅ 创建 Merge Request - ✅ 创建 Merge Request
- ✅ 手动触发 Pipeline - ✅ 手动触发 Pipeline
...@@ -99,7 +99,7 @@ GitLab CI Pipeline ...@@ -99,7 +99,7 @@ GitLab CI Pipeline
```bash ```bash
git add .gitlab-ci.yml package.json cypress.config.js *.md git add .gitlab-ci.yml package.json cypress.config.js *.md
git commit -m "feat: 集成Cypress测试到GitLab CI" git commit -m "feat: 集成Cypress测试到GitLab CI"
git push origin projects/e2e-demo git push origin projects
``` ```
2. **首次运行测试** 2. **首次运行测试**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment