Skip to content
GitLab
Unverified Commit 1676d0d5 authored by irwinsun's avatar irwinsun Committed by GitHub
Browse files

Merge pull request #3268 from Tencent/issue_3266 

chore: 同步配置差异 #3266
parents bf19fd9b c548aed9
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 6 deletions
+8 -6
.github/workflows/release.yml
+ 2
- 1
View file @ 1676d0d5
......@@ -105,7 +105,8 @@ jobs:
bootlist=`ls boot-*.jar`
for bootfile in $bootlist
do
servicename=`echo $bootfile | awk -F "[-.]" '{print $2}'`
# servicename=`echo $bootfile | awk -F "[-.]" '{print $2}'`
servicename=`echo $bootfile | sed 's/boot-\(.*\).jar/\1/g'`
mkdir -p $GITHUB_WORKSPACE/bkci/$servicename/
cp -v boot-$servicename.jar $GITHUB_WORKSPACE/bkci/$servicename/
done
......
support-files/bkiam/0003_bk_ci_20200623-2120_iam.json
+ 1
- 1
View file @ 1676d0d5
......@@ -5,7 +5,7 @@
"operation": "upsert_system",
"data":{
"id": "bk_ci",
"name": "蓝鲸持续集成平台",
"name": "持续集成平台",
"name_en": "bkci",
"clients": "bkci",
"provider_config": {
......
support-files/sql/5001_ci_store-init_dml_mysql.sql
+ 2
- 1
View file @ 1676d0d5
......@@ -18,7 +18,8 @@ REPLACE INTO `T_ATOM` (`ID`, `NAME`, `ATOM_CODE`, `CLASS_TYPE`, `SERVICE_SCOPE`,
('ea1d4d582a3147fdb29a04168cc79a43', 'Upload Report', 'reportArchive', 'reportArchive', '[ \"pipeline\" ]', 'AGENT', '[ \"LINUX\", \"MACOS\", \"WINDOWS\" ]', '75c96e7aa24f481789300cd1737b1ae1', '', 0, 7, NULL, '可将构建机上的html报告归档至蓝盾，同时发送邮件出来', '可将构建机上的html报告归档至蓝盾，同时发送邮件出来', 1, '1.0.0', '/ms/artifactory/api/user/artifactories/file/download?filePath=%2Ffile%2Fpng%2FreportArchive.png', NULL, True, True, False, NULL, NULL, False, '1.0', '{\n \"fileDir\": {\n \"type\": \"text\",\n \"required\": true,\n \"component\": \"vuex-input\",\n \"label\": \"待展示的产出物报告路径（该路径下所有子文件均会被归档）\",\n \"placeholder\": \"./report/\",\n \"desc\": \"目前支持html文件的自动渲染\"\n },\n \"indexFile\": {\n \"type\": \"text\",\n \"required\": true,\n \"component\": \"vuex-input\",\n \"label\": \"入口文件\",\n \"placeholder\": \"index.html\"\n },\n \"reportName\": {\n \"type\": \"text\",\n \"required\": true,\n \"component\": \"vuex-input\",\n \"label\": \"标签别名\",\n \"placeholder\": \"请输入自定义报告名称\"\n },\n \"enableEmail\": {\n \"rule\": {},\n \"type\": \"boolean\",\n \"required\": false,\n \"text\": \"\",\n \"desc\": \"\",\n \"default\": true\n },\n \"emailReceivers\": {\n \"rule\": {},\n \"component\": \"user-input\",\n \"required\": true,\n \"label\": \"收件人\",\n \"placeholder\": \"\",\n \"default\": []\n },\n \"emailTitle\": {\n \"type\": \"text\",\n \"required\": true,\n \"component\": \"vuex-input\",\n \"label\": \"邮件主题\",\n \"placeholder\": \"请输入邮件主题\",\n \"default\": \"【${BK_CI_PIPELINE_NAME}】 #${BK_CI_BUILD_NUM} 自定义报告已归档\"\n }\n}', '{}', 'system', 90, 'system', 'system', '2019-03-04 18:09:40', '2019-04-19 15:05:17', 0),
('6dbd742f76854aedb2603430574d842b', 'SVN', 'codeSVNWebHookTrigger', 'codeSVNWebHookTrigger', '[ \"pipeline\" ]', 'AGENT', '[ \"LINUX\", \"MACOS\", \"WINDOWS\" ]', 'e1bea5430f574f9ea3e0312dc7de9efa', '', 0, 7, NULL, '监听到SVN代码库的相关事件时启动流水线', '监听到SVN代码库的相关事件时启动流水线', 0, '1.0.0', '/ms/artifactory/api/user/artifactories/file/download?filePath=%2Ffile%2Fpng%2FsvnTrigger.png', NULL, b'1', b'1', b'0', NULL, NULL, b'0', '1.0', '{\"repositoryType\":{\"rule\":{},\"type\":\"enum\",\"component\":\"enum-input\",\"required\":true,\"label\":\"代码库\",\"list\":[{\"value\":\"ID\",\"label\":\"按代码库选择\"},{\"value\":\"NAME\",\"label\":\"按代码库别名输入\"}],\"default\":\"ID\",\"desc\":\"\"},\"repositoryHashId\":{\"rule\":{},\"label\":\"\",\"hasAddItem\":true,\"component\":\"request-selector\",\"searchable\":true,\"placeholder\":\"请选择代码库名称\",\"required\":true,\"default\":\"\",\"url\":\"/repository/api/user/repositories/{projectId}/hasPermissionList?permission=USE&repositoryType=CODE_SVN&page=1&pageSize=1000\",\"paramId\":\"repositoryHashId\",\"paramName\":\"aliasName\",\"tools\":{\"edit\":true,\"del\":false}},\"repositoryName\":{\"rule\":{},\"type\":\"text\",\"component\":\"vuex-input\",\"required\":true,\"hidden\":true,\"label\":\"\",\"placeholder\":\"请输入代码库别名\",\"default\":\"\"},\"relativePath\":{\"rule\":{},\"type\":\"text\",\"required\":false,\"component\":\"vuex-input\",\"label\":\"代码库相对路径\",\"placeholder\":\"以代码库为根路径的相对路径，如branchs/v1.0.0, 多个路径以英文逗号分隔\",\"default\":\"\"},\"excludePaths\":{\"rule\":{},\"type\":\"text\",\"required\":false,\"component\":\"vuex-input\",\"label\":\"排除以下路径\",\"placeholder\":\"多个路径以英文逗号分隔\",\"default\":\"\"},\"includeUsers\":{\"rule\":{},\"type\":\"text\",\"required\":false,\"component\":\"vuex-input\",\"label\":\"包含以下人员\",\"placeholder\":\"多个人名以英文逗号分隔\",\"default\":\"\"},\"excludeUsers\":{\"rule\":{},\"type\":\"text\",\"required\":false,\"component\":\"vuex-input\",\"label\":\"排除以下人员\",\"placeholder\":\"多个路径以英文逗号分隔\",\"default\":\"\"}}', '{}', 'system', 6, 'system', 'system', '2019-03-04 18:09:39', '2020-05-21 11:17:42', 0),
('6e715b411b7e4c35b5944a03b4f488a9', 'GitLab', 'codeGitlabWebHookTrigger', 'codeGitlabWebHookTrigger', '[ \"pipeline\" ]', 'AGENT', '[ \"LINUX\", \"MACOS\", \"WINDOWS\" ]', 'e1bea5430f574f9ea3e0312dc7de9efa', '', 0, 7, NULL, '监听到GitLab代码库的相关事件时启动流水线', '监听到GitLab代码库的相关事件时启动流水线', 0, '1.0.0', '/ms/artifactory/api/user/artifactories/file/download?filePath=%2Ffile%2Fpng%2FgitlabTrigger.png', NULL, b'1', b'1', b'0', NULL, NULL, b'0', '1.0', '{\"repositoryHashId\":{\"rule\":{},\"type\":\"text\",\"label\":\"代码库\",\"hasAddItem\":true,\"required\":true,\"component\":\"request-selector\",\"searchable\":true,\"placeholder\":\"请选择代码库名称\",\"default\":\"\",\"url\":\"/repository/api/user/repositories/{projectId}/hasPermissionList?permission=USE&repositoryType=CODE_GITLAB&page=1&pageSize=500\",\"paramId\":\"repositoryHashId\",\"paramName\":\"aliasName\",\"tools\":{\"edit\":true,\"del\":false}},\"branchName\":{\"rule\":{},\"type\":\"text\",\"required\":false,\"component\":\"vuex-input\",\"label\":\"分支名称\",\"placeholder\":\"默认为所有分支\",\"default\":\"\"}}', '{}', 'system', 0, 'system', 'system', '2019-03-04 18:09:39', '2020-04-26 12:16:06', 0),
('eaa2bfb9f95245b482039f9bebccfcc9', 'GitHub', 'codeGithubWebHookTrigger', 'codeGithubWebHookTrigger', '[ \"pipeline\" ]', 'AGENT', '[ \"LINUX\", \"MACOS\", \"WINDOWS\" ]', 'e1bea5430f574f9ea3e0312dc7de9efa', '', 0, 7, NULL, '监听到GitHub代码库的相关事件时启动流水线', '监听到GitHub代码库的相关事件时启动流水线', 0, '1.0.0', '/ms/artifactory/api/user/artifactories/file/download?filePath=%2Ffile%2Fpng%2FgithubTrigger.png', NULL, b'1', b'1', b'0', NULL, NULL, b'0', '1.0', '{\"repositoryType\":{\"rule\":{},\"type\":\"enum\",\"component\":\"enum-input\",\"required\":true,\"label\":\"代码库\",\"list\":[{\"value\":\"ID\",\"label\":\"按代码库选择\"},{\"value\":\"NAME\",\"label\":\"按代码库别名输入\"}],\"default\":\"ID\",\"desc\":\"\"},\"repositoryHashId\":{\"rule\":{},\"type\":\"text\",\"label\":\"\",\"hasAddItem\":true,\"component\":\"request-selector\",\"searchable\":true,\"placeholder\":\"请选择代码库名称\",\"required\":true,\"default\":\"\",\"url\":\"/repository/api/user/repositories/{projectId}/hasPermissionList?permission=USE&repositoryType=GITHUB&page=1&pageSize=100\",\"paramId\":\"repositoryHashId\",\"paramName\":\"aliasName\",\"tools\":{\"edit\":true,\"del\":false},\"list\":[]},\"repositoryName\":{\"rule\":{},\"type\":\"text\",\"component\":\"vuex-input\",\"required\":true,\"hidden\":true,\"label\":\"\",\"placeholder\":\"请输入代码库别名\",\"default\":\"\"},\"branchName\":{\"rule\":{},\"type\":\"text\",\"required\":false,\"component\":\"vuex-input\",\"label\":\"监听以下分支\",\"placeholder\":\"默认为所有分支，多个分支间以英文逗号分隔\",\"default\":\"\"},\"excludeBranchName\":{\"rule\":{},\"type\":\"text\",\"required\":false,\"component\":\"vuex-input\",\"label\":\"排除以下分支\",\"placeholder\":\"多个分支间以英文逗号分隔\",\"default\":\"\"},\"excludeUsers\":{\"rule\":{},\"component\":\"vuex-input\",\"required\":false,\"label\":\"排除以下人员\",\"default\":\"\"},\"eventType\":{\"rule\":{},\"type\":\"text\",\"required\":false,\"component\":\"enum-input\",\"label\":\"事件类型\",\"list\":[{\"label\":\"Commit Push Hook\",\"value\":\"PUSH\",\"tips\":\"有新的推送事件到项目时，会触发。 如果是tags推送，则不会触发。\"},{\"label\":\"Create Branch Or Tag\",\"value\":\"CREATE\",\"tips\":\"项目中新增或branch或tag时会触发\"},{\"label\":\"Pull Request Hook\",\"value\":\"PULL_REQUEST\",\"tips\":\"项目中新增Pull Request时会触发\"}],\"default\":\"PUSH\"}}', '{}', 'system', 2, 'system', 'system', '2019-03-04 18:09:39', '2020-04-26 12:17:06', 0);
('eaa2bfb9f95245b482039f9bebccfcc9', 'GitHub', 'codeGithubWebHookTrigger', 'codeGithubWebHookTrigger', '[ \"pipeline\" ]', 'AGENT', '[ \"LINUX\", \"MACOS\", \"WINDOWS\" ]', 'e1bea5430f574f9ea3e0312dc7de9efa', '', 0, 7, NULL, '监听到GitHub代码库的相关事件时启动流水线', '监听到GitHub代码库的相关事件时启动流水线', 0, '1.0.0', '/ms/artifactory/api/user/artifactories/file/download?filePath=%2Ffile%2Fpng%2FgithubTrigger.png', NULL, b'1', b'1', b'0', NULL, NULL, b'0', '1.0', '{\"repositoryType\":{\"rule\":{},\"type\":\"enum\",\"component\":\"enum-input\",\"required\":true,\"label\":\"代码库\",\"list\":[{\"value\":\"ID\",\"label\":\"按代码库选择\"},{\"value\":\"NAME\",\"label\":\"按代码库别名输入\"}],\"default\":\"ID\",\"desc\":\"\"},\"repositoryHashId\":{\"rule\":{},\"type\":\"text\",\"label\":\"\",\"hasAddItem\":true,\"component\":\"request-selector\",\"searchable\":true,\"placeholder\":\"请选择代码库名称\",\"required\":true,\"default\":\"\",\"url\":\"/repository/api/user/repositories/{projectId}/hasPermissionList?permission=USE&repositoryType=GITHUB&page=1&pageSize=100\",\"paramId\":\"repositoryHashId\",\"paramName\":\"aliasName\",\"tools\":{\"edit\":true,\"del\":false},\"list\":[]},\"repositoryName\":{\"rule\":{},\"type\":\"text\",\"component\":\"vuex-input\",\"required\":true,\"hidden\":true,\"label\":\"\",\"placeholder\":\"请输入代码库别名\",\"default\":\"\"},\"branchName\":{\"rule\":{},\"type\":\"text\",\"required\":false,\"component\":\"vuex-input\",\"label\":\"监听以下分支\",\"placeholder\":\"默认为所有分支，多个分支间以英文逗号分隔\",\"default\":\"\"},\"excludeBranchName\":{\"rule\":{},\"type\":\"text\",\"required\":false,\"component\":\"vuex-input\",\"label\":\"排除以下分支\",\"placeholder\":\"多个分支间以英文逗号分隔\",\"default\":\"\"},\"excludeUsers\":{\"rule\":{},\"component\":\"vuex-input\",\"required\":false,\"label\":\"排除以下人员\",\"default\":\"\"},\"eventType\":{\"rule\":{},\"type\":\"text\",\"required\":false,\"component\":\"enum-input\",\"label\":\"事件类型\",\"list\":[{\"label\":\"Commit Push Hook\",\"value\":\"PUSH\",\"tips\":\"有新的推送事件到项目时，会触发。 如果是tags推送，则不会触发。\"},{\"label\":\"Create Branch Or Tag\",\"value\":\"CREATE\",\"tips\":\"项目中新增或branch或tag时会触发\"},{\"label\":\"Pull Request Hook\",\"value\":\"PULL_REQUEST\",\"tips\":\"项目中新增Pull Request时会触发\"}],\"default\":\"PUSH\"}}', '{}', 'system', 2, 'system', 'system', '2019-03-04 18:09:39', '2020-04-26 12:17:06', 0),
('24425d3fa0b645dc8ab23013e9f1df5e','TGit','codeTGitWebHookTrigger','codeTGitWebHookTrigger','[ \"pipeline\" ]','AGENT','[ \"LINUX\", \"MACOS\", \"WINDOWS\" ]','e1bea5430f574f9ea3e0312dc7de9efa','',0,7,NULL,'监听到TGit代码库的相关事件时启动流水线','监听到TGit代码库的相关事件时启动流水线',0,'1.0.0','/ms/artifactory/api/user/artifactories/file/download?filePath=%2Ffile%2Fpng%2FtgitTrigger.png',NULL,b'1',b'1',b'0',NULL,NULL,b'0','1.1','{\"input\":{\"repositoryType\":{\"rule\":{},\"type\":\"enum-input\",\"required\":true,\"label\":\"代码库\",\"list\":[{\"value\":\"ID\",\"label\":\"按代码库选择\"},{\"value\":\"NAME\",\"label\":\"按代码库别名输入\"}],\"default\":\"ID\",\"desc\":\"\"},\"repositoryHashId\":{\"rule\":{},\"label\":\"\",\"hasAddItem\":true,\"type\":\"request-selector\",\"searchable\":true,\"placeholder\":\"请选择代码库名称\",\"required\":true,\"default\":\"\",\"url\":\"/repository/api/user/repositories/{projectId}/hasPermissionList?permission=USE&repositoryType=CODE_TGIT&page=1&pageSize=100\",\"paramId\":\"repositoryHashId\",\"paramName\":\"aliasName\",\"tools\":{\"edit\":true,\"del\":false},\"rely\":{\"operation\":\"OR\",\"expression\":[{\"key\":\"repositoryType\",\"value\":\"ID\"}]}},\"repositoryName\":{\"rule\":{},\"type\":\"vuex-input\",\"required\":true,\"label\":\"\",\"placeholder\":\"请输入代码库别名\",\"default\":\"\",\"rely\":{\"operation\":\"AND\",\"expression\":[{\"key\":\"repositoryType\",\"value\":\"NAME\"}]}},\"branchName\":{\"rule\":{},\"required\":false,\"type\":\"vuex-input\",\"label\":\"监听以下目标分支\",\"placeholder\":\"默认为所有分支，多个分支间以英文逗号分隔\",\"default\":\"\",\"rely\":{\"operation\":\"NOT\",\"expression\":[{\"key\":\"eventType\",\"value\":\"TAG_PUSH\"}]}},\"excludeBranchName\":{\"rule\":{},\"required\":false,\"type\":\"vuex-input\",\"label\":\"排除以下目标分支\",\"placeholder\":\"多个分支间以英文逗号分隔\",\"default\":\"\",\"rely\":{\"operation\":\"NOT\",\"expression\":[{\"key\":\"eventType\",\"value\":\"TAG_PUSH\"}]}},\"includeSourceBranchName\":{\"rule\":{},\"required\":false,\"type\":\"vuex-input\",\"label\":\"监听以下源分支\",\"placeholder\":\"多个路径间以英文逗号分隔\",\"default\":\"\",\"rely\":{\"operation\":\"OR\",\"expression\":[{\"key\":\"eventType\",\"value\":\"MERGE_REQUEST\"},{\"key\":\"eventType\",\"value\":\"MERGE_REQUEST_ACCEPT\"}]}},\"excludeSourceBranchName\":{\"rule\":{},\"required\":false,\"type\":\"vuex-input\",\"label\":\"排除以下源分支\",\"placeholder\":\"多个路径间以英文逗号分隔\",\"default\":\"\",\"rely\":{\"operation\":\"OR\",\"expression\":[{\"key\":\"eventType\",\"value\":\"MERGE_REQUEST\"},{\"key\":\"eventType\",\"value\":\"MERGE_REQUEST_ACCEPT\"}]}},\"tagName\":{\"rule\":{},\"required\":false,\"type\":\"vuex-input\",\"label\":\"监听以下tag\",\"placeholder\":\"默认为所有tag，多个tag间以英文逗号分隔\",\"default\":\"\",\"rely\":{\"operation\":\"AND\",\"expression\":[{\"key\":\"eventType\",\"value\":\"TAG_PUSH\"}]}},\"excludeTagName\":{\"rule\":{},\"required\":false,\"type\":\"vuex-input\",\"label\":\"排除以下tag\",\"placeholder\":\"多个tag间以英文逗号分隔\",\"default\":\"\",\"rely\":{\"operation\":\"AND\",\"expression\":[{\"key\":\"eventType\",\"value\":\"TAG_PUSH\"}]}},\"includePaths\":{\"rule\":{},\"required\":false,\"type\":\"vuex-input\",\"label\":\"监听以下路径\",\"placeholder\":\"多个路径间以英文逗号分隔\",\"default\":\"\",\"rely\":{\"operation\":\"NOT\",\"expression\":[{\"key\":\"eventType\",\"value\":\"TAG_PUSH\"}]}},\"excludePaths\":{\"rule\":{},\"required\":false,\"type\":\"vuex-input\",\"label\":\"排除以下路径\",\"placeholder\":\"多个路径间以英文逗号分隔\",\"default\":\"\",\"rely\":{\"operation\":\"NOT\",\"expression\":[{\"key\":\"eventType\",\"value\":\"TAG_PUSH\"}]}},\"excludeUsers\":{\"rule\":{},\"type\":\"staff-input\",\"required\":false,\"multiSelect\":true,\"label\":\"排除以下人员\",\"default\":[],\"rely\":{\"operation\":\"NOT\",\"expression\":[{\"key\":\"eventType\",\"value\":\"TAG_PUSH\"}]}},\"eventType\":{\"rule\":{},\"required\":false,\"type\":\"enum-input\",\"label\":\"事件类型\",\"list\":[{\"label\":\"Commit Push Hook\",\"value\":\"PUSH\",\"tips\":\"有新的推送事件到项目时，会触发。 如果是tags推送，则不会触发。\"},{\"label\":\"Tag Push Hook\",\"value\":\"TAG_PUSH\",\"tips\":\"项目中新增或删除tags时会触发\"},{\"label\":\"Merge Request Hook\",\"value\":\"MERGE_REQUEST\",\"tips\":\"项目中新增Merge Request时会触发\"},{\"label\":\"Merge Request Accept Hook\",\"value\":\"MERGE_REQUEST_ACCEPT\",\"tips\":\"项目中Merge Request accept时会触发\"}],\"default\":\"PUSH\"},\"block\":{\"rule\":{},\"type\":\"atom-checkbox\",\"required\":false,\"text\":\"同时锁定提交\",\"default\":false,\"hidden\":true}}}','{}','system','2','system','system','2020-08-29 12:18:20','2020-09-03 10:43:18', 0);
REPLACE INTO `T_BUILD_RESOURCE`(`ID`, `BUILD_RESOURCE_CODE`, `BUILD_RESOURCE_NAME`, `DEFAULT_FLAG`, `CREATOR`, `MODIFIER`, `CREATE_TIME`, `UPDATE_TIME`) VALUES ('55913ac708c211e62192fa163e50f2b5', 'centos7.2', 'centos7.2', b'0', 'system', 'system', '2019-07-12 12:29:59', '2019-07-12 12:29:59');
......
support-files/templates/#etc#ci#application-log.yml
+ 3
- 3
View file @ 1676d0d5
......@@ -20,9 +20,9 @@ log:
indexMaxSize: __BK_CI_LUCENE_INDEX_MAX_SIZE__ # 单个构建的最大日志行数，建议设在100万内
# 通过Elasticsearch服务进行存储的必要配置
elasticsearch:
ip: __BKCI_ES_IP__
port: __BKCI_ES_PORT__
cluster: __BKCI_ES_CLUSTER__
ip: __BK_CI_ES_REST_ADDR__ # 今后只使用REST client.
port: __BK_CI_ES_REST_PORT__
cluster: __BK_CI_ES_CLUSTER_NAME__
name: DEVOPS
# ES集群如果不要求账号密码认证，则可以去掉以下2个ES的访问账号密码配置项或留空
username: __BK_CI_ES_USER__
......
Supports Markdown
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

免费DevSecOps平台，让您的项目体验完整的DevSecOps流程，让项目更安全