diff options
| author | fumingwei <[email protected]> | 2020-07-16 20:20:51 +0800 |
|---|---|---|
| committer | fumingwei <[email protected]> | 2020-07-16 20:20:51 +0800 |
| commit | 799f3e4a2f562ea12c076b4d3cb0fbd2eadc0eca (patch) | |
| tree | d821c0cc73c5746cf3657c0abf353bb0a8bf9054 | |
| parent | a75a3a44f4d0f2230d695de4fad4db7606aafe59 (diff) | |
删除 构建包过程中，从docker register 下载 docker image 并生成tar的过程
| -rw-r--r-- | build_config/group_vars/local.yml | 54 | ||||
| -rw-r--r-- | roles/package-build/tasks/main.yml | 2 |
2 files changed, 28 insertions, 28 deletions
diff --git a/build_config/group_vars/local.yml b/build_config/group_vars/local.yml index f0f327a..1690282 100644 --- a/build_config/group_vars/local.yml +++ b/build_config/group_vars/local.yml @@ -1,30 +1,30 @@ -dockerImages: - - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/unittest" - tag: latest - - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/wpr" - tag: latest - - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/badssl" - tag: latest - -dockerImages2tags: - - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/unittest:latest" - repo: "unittest-self-test:latest" - - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/wpr:latest" - repo: "wpr-self-test:latest" - - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/badssl:latest" - repo: "badssl-self-test:latest" - -dockerImagesTar: - - name: "unittest-self-test" - tag: "latest" - tarpath: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/images/unittest.tar - - name: "wpr-self-test" - tag: "latest" - tarpath: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/images/wpr.tar - - name: "badssl-self-test" - tag: "latest" - tarpath: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/images/badssl.tar - +#dockerImages: +# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/unittest" +# tag: latest +# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/wpr" +# tag: latest +# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/badssl" +# tag: latest +# +#dockerImages2tags: +# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/unittest:latest" +# repo: "unittest-self-test:latest" +# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/wpr:latest" +# repo: "wpr-self-test:latest" +# - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/badssl:latest" +# repo: "badssl-self-test:latest" +# +#dockerImagesTar: +# - name: "unittest-self-test" +# tag: "latest" +# tarpath: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/images/unittest.tar +# - name: "wpr-self-test" +# tag: "latest" +# tarpath: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/images/wpr.tar +# - name: "badssl-self-test" +# tag: "latest" +# tarpath: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/images/badssl.tar +# tarpath: src: - /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/install_config diff --git a/roles/package-build/tasks/main.yml b/roles/package-build/tasks/main.yml index a8f831e..5819080 100644 --- a/roles/package-build/tasks/main.yml +++ b/roles/package-build/tasks/main.yml @@ -1,4 +1,4 @@ --- -- include: ImageDownload.yml +#- include: ImageDownload.yml - include: RpmDownload.yml - include: TarBuild.yml |