Commit Graph

1899 Commits

Author SHA1 Message Date
zhouqunjie 8bfd6d54d6 Delete deploy/pcm-yaml.zip
Former-commit-id: 4bfedc3b22414fa1d940391b987fabbe06941492
2024-05-15 10:32:18 +08:00
tzwang 8f5d161236 Merge pull request 'fix aitask status' (#174) from tzwang/pcm-coordinator:master into master
Former-commit-id: a67aa626fc6d38b2670a6062beb55bbfd9653916
2024-05-14 17:51:35 +08:00
tzwang 9b518d0182 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: b8f86f8afbca80fac35424a62b8ca72f7aad047d
2024-05-14 17:48:13 +08:00
tzwang 3b5295a08e fix aitask status bugs
Former-commit-id: 4f8466962405557bd85d51573dd79d86984cafce
2024-05-14 17:46:00 +08:00
zhouqunjie 91d27d99c4 Merge pull request 'fix' (#173) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: 4ba4128e94cab96a4c5d4a48e3bfb9402409f48d
2024-05-14 17:41:00 +08:00
Jake 896aa2c5ab fix
Former-commit-id: a9e47ada3f20619fd1df0eadbb59822901a87b8f
2024-05-14 17:36:37 +08:00
tzwang fcd12bbe61 Merge pull request 'fix db bugs' (#172) from tzwang/pcm-coordinator:master into master
Former-commit-id: 91e8e0532cbd60ec7a5ea4b7419515a49fe0aaf4
2024-05-14 15:07:48 +08:00
tzwang bd3f60d62e fix db bugs
Former-commit-id: 3e372dc02fb4f2a4e4f9ab14922abaa51dbc7eea
2024-05-14 15:03:31 +08:00
tzwang 564380be1a Merge remote-tracking branch 'origin/master'
Former-commit-id: 1a42880f2615021e71045f7f808cdd75c5af8f44
2024-05-14 10:49:41 +08:00
tzwang 06aea0b26a updated aitask model
Former-commit-id: c6d375391a43e300ad5fe23757ca972f71bf492b
2024-05-14 10:49:09 +08:00
zhouqunjie 1127b2edd3 Merge pull request 'merge conflict' (#171) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: a05b4cc310d2b08ac7d3a4e81f2fb7aeaffcc7df
2024-05-14 10:47:04 +08:00
Jake 7d067b0082 merge conflict
Former-commit-id: b6a6a7c963182194e03b9673f5b2e47fe47952f4
2024-05-14 10:43:58 +08:00
Jake 6304fee876 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
# Conflicts:
#	api/internal/logic/hpc/commithpctasklogic.go


Former-commit-id: b2c609dfe260b2149c6f50e38140561f88a1e619
2024-05-14 10:41:23 +08:00
Jake 374bb1a5ad change log level
Former-commit-id: f8155160b352fb6602fd34ca8efff37659ceab65
2024-05-14 10:40:06 +08:00
tzwang e4d9f0a5dd Merge pull request 'fix task list bugs' (#170) from tzwang/pcm-coordinator:master into master
Former-commit-id: 2e5c1028a1ae174b64648d61d0e6fe3de1f216b4
2024-05-14 08:50:21 +08:00
tzwang dd1142245c fix task list bugs
Former-commit-id: c71b8802cd2d99a628175171ca2149e5a870c137
2024-05-14 08:46:47 +08:00
tzwang 075f3cab09 Merge pull request 'fix ai task time bugs' (#169) from tzwang/pcm-coordinator:master into master
Former-commit-id: 8908c540c224842bd33d2f4c812a5be9e24552a9
2024-05-13 15:29:52 +08:00
tzwang 520cfc00d9 updated aitask apis
Former-commit-id: 3b5a3d75f23fc82c31f3ab84866c5ebc64ff5b36
2024-05-13 15:22:21 +08:00
tzwang e2fc3b8b87 fix task time bugs
Former-commit-id: ee55e0cc23f74218579a00960f599b60da5cdb04
2024-05-13 11:34:45 +08:00
qiwang a48a44a05a fix: create vm task
Former-commit-id: 62cd00915314b280231809d0b6d7b7cffc1966ee
2024-05-13 10:32:15 +08:00
zhouqunjie 25ea887815 ADD file via upload
Former-commit-id: 657362611cca51134350126428b9dc49b56d5a60
2024-05-13 10:06:08 +08:00
zhouqunjie b6606bc890 Delete deploy/pcm.sql
Former-commit-id: 3dec75bd71e8eb0d1245ed38e96a03e0503ecde6
2024-05-13 10:05:45 +08:00
zhouqunjie ffc0f11fee ADD file via upload
Former-commit-id: 3b9ec36ca724903ebb74d7165b4cea7a5db52c64
2024-05-13 10:04:19 +08:00
zhouqunjie 6aa80d91c5 Delete deploy/pcm.sql
Former-commit-id: 778b99e2943ab58c9ce30ce6682d2e58dc39b8ee
2024-05-13 10:02:48 +08:00
zhouqunjie a6b17dd36d ADD file via upload
Former-commit-id: a02377cee6d7f3fa91d43842f774f049dc10ac7d
2024-05-13 09:45:14 +08:00
zhouqunjie 48807f3eef Delete deploy/pcm-yaml.zip
Former-commit-id: 9473e8df7ac80a8ff848bb7ef6230030cb0caa29
2024-05-13 09:45:14 +08:00
zhouqunjie 975e957321 ADD file via upload
Former-commit-id: b18631cbd6f69e82c974297c6d4eb01cc56d04cf
2024-05-13 09:33:55 +08:00
zhouqunjie f9c5f6d158 Delete deploy/pcm.sql
Former-commit-id: bceb316dbb1de25562af45371c54a23a5650586f
2024-05-13 09:33:34 +08:00
tzwang dd545cf7cf Merge pull request 'fix resource not found' (#168) from tzwang/pcm-coordinator:master into master
Former-commit-id: 50c2b5a6dfdd516bcf039ddf493e6e680e3744d4
2024-05-13 09:10:14 +08:00
tzwang 99985ec130 updated octopus cardname
Former-commit-id: a62d3350bd21690be3f75a11bfed6518fc23b0a8
2024-05-12 22:50:48 +08:00
tzwang e7eaa2be38 Merge pull request 'fix submit bugs' (#167) from tzwang/pcm-coordinator:master into master
Former-commit-id: f37ad9723be7ccbd56a18f3996ab888862275db1
2024-05-11 19:37:12 +08:00
tzwang f8a94bb090 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: 2953ff979b5dac97b26bdcfabfe7e9b3d5ea442f
2024-05-11 19:26:17 +08:00
tzwang e12f80725e fix log bugs
Former-commit-id: 92a183cafaea2973d5d0fe5c868537c9cd69e4b2
2024-05-11 19:25:33 +08:00
tzwang a0181ba9d6 Merge pull request 'fix bugs' (#166) from tzwang/pcm-coordinator:master into master
Former-commit-id: 3842e14c1e64dd1ca3fddec6f68c6e7ba6cff331
2024-05-11 18:44:08 +08:00
tzwang 8ccb51cab0 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: e31d516e8d87623c8471fb45c383834cb6ad21b3
2024-05-11 18:40:26 +08:00
tzwang c4d4e74d33 fix status bugs
Former-commit-id: 547178d1d6f7af5c8b0745ad04885402a1da68b0
2024-05-11 18:40:06 +08:00
zhangweiii 9a34b347d2 Merge pull request 'delete alertrule' (#165) from zhangweiii/pcm-coordinator:master into master
Former-commit-id: d4bf35b8268451baae199a1ec005bd4c3dd88a83
2024-05-11 18:31:26 +08:00
zhangwei c14b67d312 delete alertrule
Former-commit-id: dcff95ad60288cbcb62998aa849909fdbd543a8c
2024-05-11 18:28:07 +08:00
zhangwei 81f81d209e Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
# Conflicts:
#	api/desc/pcm.api


Former-commit-id: 9163707ba3f4c77f3fef173cec2491f1edfd2a94
2024-05-11 18:25:47 +08:00
zhangwei 256da70aaf delete alertrule
Former-commit-id: 22a1225ebfa1b0a350fe022b26dcfd3507fa0d6b
2024-05-11 18:24:04 +08:00
tzwang a779216f68 fix convert bugs
Former-commit-id: 8e1dae6f6d88c44b821e75557f3cba48074449d3
2024-05-11 18:04:19 +08:00
tzwang 52aa14c613 fix convert bugs
Former-commit-id: 3cb8e750a3fb55017152108be812b37dff510095
2024-05-11 17:59:03 +08:00
qiwang f264ac5124 Merge pull request 'create vm server' (#164) from master-wq into master
Former-commit-id: f8d87615e7566df187a11fbd23000d618a591a34
2024-05-11 16:51:49 +08:00
qiwang e07106841f fix:update create vm task
Former-commit-id: f8c57df90c9d6c9992712433cc854b4b1a89da98
2024-05-11 16:31:42 +08:00
devad b31e368a0f Merge pull request 'fix bug' (#163) from devad/pcm-coordinator:master into master
Former-commit-id: 298c662b49197122676dedf5898d7a2fcc43299b
2024-05-11 16:21:36 +08:00
jagger 9722801813 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 1ef360be0c89fdf57fe54497296380fbe068cb95
2024-05-11 16:18:09 +08:00
zhouqunjie 60b2c9d4dc Merge pull request 'fix bug' (#162) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: 0e915b60db1bddd01388c7eb2bbfb91784f0994f
2024-05-11 15:45:49 +08:00
zhouqunjie 91c38d66fd fix bug
Former-commit-id: a32dab848d0e2055a62190de1461d4ba7be83ca5
2024-05-11 15:42:52 +08:00
zhouqunjie 8bc4176932 Merge pull request 'multiple adapters for hps task submit' (#161) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: 9e788a4d5b279f88e708d6342dbb0dffb1ab3061
2024-05-11 15:18:55 +08:00
qiwang 935af66c47 Merge pull request 'modify interface' (#160) from qiwang/pcm-coordinator:upmaster_wq into master
Former-commit-id: b385a66a6920c111b9474d6167234afb77ccd6c8
2024-05-11 15:15:59 +08:00