From 4614c325f6ce7e3758781e28d2d390d86d34ab70 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Mon, 20 Jul 2020 14:22:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=8Edocker=20registy=20?=
 =?UTF-8?q?=20=E6=8B=89=E5=8F=96=20docker=20image?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 15 +++++----------
 ci/travis.sh   | 13 -------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3490123..cde7ada 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 cache:
    key: "$CI_COMMIT_REF_SLUG"
    paths:
-     - build
+     - images
 
 .build_docker_images:
   image: docker:stable
@@ -31,9 +31,6 @@ cache:
     - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
     - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
     - chmod +x ./ci/travis.sh
-  script:
-    - yum makecache
-    - ./ci/travis.sh
   tags:
   - share
 
@@ -47,12 +44,11 @@ images_build:
   script:
     - mkdir build
     - docker build -t $UNITTEST_IMAGE_TAG -f ./unittest_python/Dockerfile ./unittest_python/
-    - docker save $UNITTEST_IMAGE_TAG > build/unittest.tar
+    - docker save $UNITTEST_IMAGE_TAG > images/unittest.tar
     - docker build -t $WPR_IMAGE_TAG -f ./wpr_golang/Dockerfile ./wpr_golang/
-    - docker save $UNITTEST_IMAGE_TAG > build/wpr.tar
+    - docker save $UNITTEST_IMAGE_TAG > images/wpr.tar
     - docker build -t $BADSSL_IMAGE_TAG -f ./badssl.com/Dockerfile ./badssl.com/
-    - docker save $BADSSL_IMAGE_TAG  > build/badssl.tar
-    - pwd && ls -halt ./* && ls -halt ./build
+    - docker save $BADSSL_IMAGE_TAG  > images/badssl.tar
 
 rpm_build:
   stage: upload
@@ -63,8 +59,7 @@ rpm_build:
     PULP3_DIST_NAME: tsg-stable-x86_64.el7
   extends: .build_rpm
   script:
-    - pwd && ls -halt ./*
-    - ls -halt ./build
+    - ./ci/travis.sh
   dependencies:
     - images_build
   only:
diff --git a/ci/travis.sh b/ci/travis.sh
index 506416e..284d378 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -34,19 +34,6 @@ env | sort
 : "${COMPILER_IS_GNUCXX:=OFF}"
 
 mkdir build || true
-mkdir images || true
-
-if [ -n "${PACKAGE}" ]; then
-	docker pull git.mesalab.cn:7443/tsg/tsg-diagnose/unittest:latest
-	docker pull git.mesalab.cn:7443/tsg/tsg-diagnose/wpr:latest
-	docker pull git.mesalab.cn:7443/tsg/tsg-diagnose/badssl:latest
-	docker tag git.mesalab.cn:7443/tsg/tsg-diagnose/unittest:latest unittest-self-test:latest
-	docker tag git.mesalab.cn:7443/tsg/tsg-diagnose/wpr:latest wpr-self-test:latest
-	docker tag git.mesalab.cn:7443/tsg/tsg-diagnose/badssl:latest badssl-self-test:latest
-	docker save unittest-self-test:latest > images/unittest.tar
-	docker save wpr-self-test:latest > images/wpr.tar
-	docker save badssl-self-test:latest > images/badssl.tar
-fi
 
 cd build