From 799f3e4a2f562ea12c076b4d3cb0fbd2eadc0eca Mon Sep 17 00:00:00 2001 From: fumingwei Date: Thu, 16 Jul 2020 20:20:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=8C=85=E8=BF=87=E7=A8=8B=E4=B8=AD=EF=BC=8C=E4=BB=8Edocker=20?= =?UTF-8?q?register=20=E4=B8=8B=E8=BD=BD=20docker=20image=20=E5=B9=B6?= =?UTF-8?q?=E7=94=9F=E6=88=90tar=E7=9A=84=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_config/group_vars/local.yml | 54 +++++++++++++++--------------- 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