floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ci/cd bug 

Former-commit-id: c71f4288f56c220fcb2096657207570078993f53
This commit is contained in:
devad 2024-01-24 11:22:19 +08:00
parent 39e8759eab 5d24fffffa
commit ed5be1c6a5
5 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.devops/api.yml → .devops/xjlab-api.yml
View File

@ -1,5 +1,5 @@
version: 2 version: 2
name: api name: xjlab-api
description: "" description: ""
global: global:
concurrent: 1 concurrent: 1
@ -10,12 +10,6 @@ global:
required: false required: false
type: STRING type: STRING
hidden: false hidden: false
- ref: nacos_host
name: nacos_host
value: '"10.206.0.12"'
required: false
type: STRING
hidden: false
- ref: secret_name - ref: secret_name
name: "" name: ""
value: '"jcce-aliyuncs"' value: '"jcce-aliyuncs"'
@ -45,8 +39,8 @@ workflow:
name: git clone name: git clone
task: git_clone@1.2.6 task: git_clone@1.2.6
input: input:
remote_url: '"https://gitlink.org.cn/jcce-pcm/pcm-coordinator.git"' remote_url: '"https://gitlink.org.cn/JointCloud/pcm-coordinator.git"'
ref: '"refs/heads/master"' ref: '"refs/heads/v0.1.0-xjlab-alpha1"'
commit_id: '""' commit_id: '""'
depth: 1 depth: 1
needs: needs:
@ -93,14 +87,12 @@ workflow:
IMAGE_NAME: '"registry.cn-hangzhou.aliyuncs.com/jcce/pcm-coordinator-api"' IMAGE_NAME: '"registry.cn-hangzhou.aliyuncs.com/jcce/pcm-coordinator-api"'
IMAGE_TAG: git_clone_0.commit_time IMAGE_TAG: git_clone_0.commit_time
SECRET_NAME: global.secret_name SECRET_NAME: global.secret_name
NACOS_HOST: global.nacos_host
PROJECT_NAME: global.project_name PROJECT_NAME: global.project_name
PROJECT_PATH: git_clone_0.git_path PROJECT_PATH: git_clone_0.git_path
script: script:
- cd ${PROJECT_PATH}/api - cd ${PROJECT_PATH}/api
- sed -i "s#image_name#${IMAGE_NAME}:${IMAGE_TAG}#" ${PROJECT_NAME}.yaml - sed -i "s#image_name#${IMAGE_NAME}:${IMAGE_TAG}#" ${PROJECT_NAME}.yaml
- sed -i "s#secret_name#${SECRET_NAME}#" ${PROJECT_NAME}.yaml - sed -i "s#secret_name#${SECRET_NAME}#" ${PROJECT_NAME}.yaml
- sed -i "s#nacos_host#${NACOS_HOST}#" ${PROJECT_NAME}.yaml
- cat ${PROJECT_NAME}.yaml - cat ${PROJECT_NAME}.yaml
needs: needs:
- git_clone_0 - git_clone_0

14
.devops/rpc.yml → .devops/xjlab-rpc.yml
View File

@ -1,5 +1,5 @@
version: 2 version: 2
name: rpc name: xjlab-rpc
description: "" description: ""
global: global:
concurrent: 1 concurrent: 1
@ -10,12 +10,6 @@ global:
required: false required: false
type: STRING type: STRING
hidden: false hidden: false
- ref: nacos_host
name: nacos_host
value: '"10.206.0.12"'
required: false
type: STRING
hidden: false
- ref: secret_name - ref: secret_name
name: "" name: ""
value: '"jcce-aliyuncs"' value: '"jcce-aliyuncs"'
@ -45,8 +39,8 @@ workflow:
name: git clone name: git clone
task: git_clone@1.2.6 task: git_clone@1.2.6
input: input:
remote_url: '"https://gitlink.org.cn/jcce-pcm/pcm-coordinator.git"' remote_url: '"https://gitlink.org.cn/JointCloud/pcm-coordinator.git"'
ref: '"refs/heads/master"' ref: '"refs/heads/v0.1.0-xjlab-alpha1"'
commit_id: '""' commit_id: '""'
depth: 1 depth: 1
needs: needs:
@ -93,14 +87,12 @@ workflow:
IMAGE_NAME: '"registry.cn-hangzhou.aliyuncs.com/jcce/pcm-coordinator-rpc"' IMAGE_NAME: '"registry.cn-hangzhou.aliyuncs.com/jcce/pcm-coordinator-rpc"'
IMAGE_TAG: git_clone_0.commit_time IMAGE_TAG: git_clone_0.commit_time
SECRET_NAME: global.secret_name SECRET_NAME: global.secret_name
NACOS_HOST: global.nacos_host
PROJECT_NAME: global.project_name PROJECT_NAME: global.project_name
PROJECT_PATH: git_clone_0.git_path PROJECT_PATH: git_clone_0.git_path
script: script:
- cd ${PROJECT_PATH}/rpc - cd ${PROJECT_PATH}/rpc
- sed -i "s#image_name#${IMAGE_NAME}:${IMAGE_TAG}#" ${PROJECT_NAME}.yaml - sed -i "s#image_name#${IMAGE_NAME}:${IMAGE_TAG}#" ${PROJECT_NAME}.yaml
- sed -i "s#secret_name#${SECRET_NAME}#" ${PROJECT_NAME}.yaml - sed -i "s#secret_name#${SECRET_NAME}#" ${PROJECT_NAME}.yaml
- sed -i "s#nacos_host#${NACOS_HOST}#" ${PROJECT_NAME}.yaml
- cat ${PROJECT_NAME}.yaml - cat ${PROJECT_NAME}.yaml
needs: needs:
- git_clone_0 - git_clone_0

6
api/etc/pcm.yaml
View File

@ -53,9 +53,9 @@ ACRpcConf:
#rpc #rpc
CephRpcConf: CephRpcConf:
target: nacos://10.206.0.12:8848/pcm.ceph.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api # target: nacos://10.206.0.12:8848/pcm.ceph.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api
# Endpoints: Endpoints:
# - 127.0.0.1:8888 - pcm-participant-ceph-service:2008
NonBlock: true NonBlock: true
Timeout: 50000 Timeout: 50000

4
api/pcm-coordinator-api.yaml
View File

@ -16,10 +16,6 @@ spec:
labels: labels:
k8s-app: pcm-coordinator-api k8s-app: pcm-coordinator-api
spec: spec:
hostAliases:
- hostnames:
- nacos.jcce.dev
ip: nacos_host
imagePullSecrets: imagePullSecrets:
- name: secret_name - name: secret_name
containers: containers:

4
rpc/pcm-coordinator-rpc.yaml
View File

@ -16,10 +16,6 @@ spec:
labels: labels:
k8s-app: pcm-coordinator-rpc k8s-app: pcm-coordinator-rpc
spec: spec:
hostAliases:
- hostnames:
- nacos.jcce.dev
ip: nacos_host
imagePullSecrets: imagePullSecrets:
- name: secret_name - name: secret_name
containers: containers: