From 11c559e2c80fbbef7af51c848d5167ec2cd9c2e7 Mon Sep 17 00:00:00 2001 From: tongyiming Date: Tue, 20 May 2025 11:00:19 +0800 Subject: [PATCH 1/3] Delete .github/workflows/sync-code.yaml --- .github/workflows/sync-code.yaml | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 .github/workflows/sync-code.yaml diff --git a/.github/workflows/sync-code.yaml b/.github/workflows/sync-code.yaml deleted file mode 100644 index 63cbd4e..0000000 --- a/.github/workflows/sync-code.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: sync-code - -on: - push: - branches: - - main - - 'coding-test/**' - - 'pipeline/**' - tags: v* - -jobs: - sync: - runs-on: ubuntu-latest - - steps: - - name: clone - run: | - if [ -d packer-plugin-tencentcloud ]; then - rm -rf packer-plugin-tencentcloud - fi - git clone https://github.com/tencentcloudstack/packer-plugin-tencentcloud.git - - name: sync - run: | - cd packer-plugin-tencentcloud - git fetch --all - git branch -r --list "origin/coding-test/*" | grep -v HEAD | grep -v master | xargs -I {} git checkout -t {} - git branch -r --list "origin/pipeline/*" | grep -v HEAD | grep -v master | xargs -I {} git checkout -t {} - git remote add tgit_origin https://${{ secrets.USERNAME }}:${{ secrets.PASSWORD }}@git.code.tencent.com/tencentcloudstack/packer-plugin-tencentcloud.git - git push -u tgit_origin -f --all - git push -u tgit_origin main:main - git push -u tgit_origin --tags From d8a2a71d53e6a67b598e6a45dfb99b5f98634201 Mon Sep 17 00:00:00 2001 From: mikatong Date: Wed, 21 May 2025 11:22:33 +0800 Subject: [PATCH 2/3] support concurrent --- builder/tencentcloud/cvm/run_config.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/tencentcloud/cvm/run_config.go b/builder/tencentcloud/cvm/run_config.go index d7cc171..2a359e3 100644 --- a/builder/tencentcloud/cvm/run_config.go +++ b/builder/tencentcloud/cvm/run_config.go @@ -116,7 +116,8 @@ var ValidCBSType = []string{ } func (cf *TencentCloudRunConfig) Prepare(ctx *interpolate.Context) []error { - packerId := fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID()[:8]) + uuid := uuid.TimeOrderedUUID() + packerId := fmt.Sprintf("packer_%s_%s", uuid[:8], uuid[9:13]) if cf.Comm.SSHKeyPairName == "" && cf.Comm.SSHTemporaryKeyPairName == "" && cf.Comm.SSHPrivateKeyFile == "" && cf.Comm.SSHPassword == "" && cf.Comm.WinRMPassword == "" { //tencentcloud support key pair name length max to 25 From 43985923ec22069486334915feda83609ec6f3d0 Mon Sep 17 00:00:00 2001 From: mikatong Date: Wed, 21 May 2025 11:33:04 +0800 Subject: [PATCH 3/3] update --- builder/tencentcloud/cvm/run_config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/tencentcloud/cvm/run_config.go b/builder/tencentcloud/cvm/run_config.go index 2a359e3..82df220 100644 --- a/builder/tencentcloud/cvm/run_config.go +++ b/builder/tencentcloud/cvm/run_config.go @@ -116,8 +116,8 @@ var ValidCBSType = []string{ } func (cf *TencentCloudRunConfig) Prepare(ctx *interpolate.Context) []error { - uuid := uuid.TimeOrderedUUID() - packerId := fmt.Sprintf("packer_%s_%s", uuid[:8], uuid[9:13]) + timeOrderedUUID := uuid.TimeOrderedUUID() + packerId := fmt.Sprintf("packer_%s_%s", timeOrderedUUID[:8], timeOrderedUUID[9:13]) if cf.Comm.SSHKeyPairName == "" && cf.Comm.SSHTemporaryKeyPairName == "" && cf.Comm.SSHPrivateKeyFile == "" && cf.Comm.SSHPassword == "" && cf.Comm.WinRMPassword == "" { //tencentcloud support key pair name length max to 25