From d4e981b7f7d61e2d90fc8695eb697689e64ffa7a Mon Sep 17 00:00:00 2001
From: jwc <jiweichuan@zdjizhi.com>
Date: Wed, 1 Jul 2020 16:45:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=83=A8=E7=BD=B2=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/com/docker_api_docker-compose.yml | 15 ++++++
 docker/wp/docker_api_docker-compose.yml  | 15 ++++++
 gitlab-lc.yml                            | 64 ++++++++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 docker/com/docker_api_docker-compose.yml
 create mode 100644 docker/wp/docker_api_docker-compose.yml
 create mode 100644 gitlab-lc.yml

diff --git a/docker/com/docker_api_docker-compose.yml b/docker/com/docker_api_docker-compose.yml
new file mode 100644
index 0000000..edce469
--- /dev/null
+++ b/docker/com/docker_api_docker-compose.yml
@@ -0,0 +1,15 @@
+version: '3.1'
+services:
+  auto-custom-clibrary:
+    image: 192.168.41.68/robotframework/auto-custom-clibrary:3.0
+    restart: always
+    container_name: auto-custom-clibrary-com
+    environment:
+      TZ: Asia/Shanghai     
+    working_dir: /usr/src/python   
+    command: robot -i tsg_bf_api -d api/$time/ autotsg
+    privileged: true
+    volumes:
+      - /home/autotsg-gao:/usr/src/python
+
+      
diff --git a/docker/wp/docker_api_docker-compose.yml b/docker/wp/docker_api_docker-compose.yml
new file mode 100644
index 0000000..1289506
--- /dev/null
+++ b/docker/wp/docker_api_docker-compose.yml
@@ -0,0 +1,15 @@
+version: '3.1'
+services:
+  auto-custom-clibrary:
+    image: 192.168.41.68/robotframework/auto-custom-clibrary:3.0
+    restart: always
+    container_name: auto-custom-clibrary-wp
+    environment:
+      TZ: Asia/Shanghai     
+    working_dir: /usr/src/python   
+    command: robot -i tsg_bf_api -d api/$time/ autotsg
+    privileged: true
+    volumes:
+      - /home/autotsg-gao:/usr/src/python
+
+      
diff --git a/gitlab-lc.yml b/gitlab-lc.yml
new file mode 100644
index 0000000..f599d9e
--- /dev/null
+++ b/gitlab-lc.yml
@@ -0,0 +1,64 @@
+stages:
+  - develop #运行的类型，有
+  - developagain
+ 
+wp: #随意填写，起标示作用，wp指全流程测试
+  stage: develop #和上述的类型对应
+
+  only:
+    - develop #指定触发分支
+  tags:
+    - "155tsg"
+
+  script: 
+    - pwd
+    - docker stop auto-custom-clibrary-wp || true && docker rm auto-custom-clibrary-wp || true
+    - cd docker/wp
+    - docker-compose build
+    - time=`date +%m%d` docker-compose up -d
+   
+
+com: #随意填写，起标示作用，com指cli测试
+  stage: develop #和上述的类型对应
+
+  only:
+    - develop #指定触发分支
+  tags:
+    - "155tsg"
+
+  script: 
+    - pwd
+    - docker stop auto-custom-clibrary-com || true && docker rm auto-custom-clibrary-com || true
+    - cd docker/com
+    - docker-compose build
+    - time=`date +%m%d` docker-compose up -d
+ 
+ 
+156wp: #随意填写，起标示作用
+  stage: developagain #和上述的类型对应
+
+  only:
+    - develop #指定触发分支
+  tags:
+    - "156tsg"
+  script: 
+    - pwd
+    - docker stop auto-custom-clibrary-wp || true && docker rm auto-custom-clibrary-wp || true
+    - cd docker/wp
+    - docker-compose build
+    - time=`date +%m%d` docker-compose up -d
+   
+
+156com: #随意填写，起标示作用
+  stage: developagain #和上述的类型对应
+
+  only:
+    - develop #指定触发分支
+  tags:
+    - "156tsg"
+  script: 
+    - pwd
+    - docker stop auto-custom-clibrary-com || true && docker rm auto-custom-clibrary-com || true
+    - cd docker/com
+    - docker-compose build
+    - time=`date +%m%d` docker-compose up -d
\ No newline at end of file