From 9b13bffbfdacd39ceecb61e9302dcc5209d6e74b Mon Sep 17 00:00:00 2001
From: Lu Qiuwen <luqiuwen@iie.ac.cn>
Date: Wed, 28 Aug 2019 16:58:26 +0800
Subject: Gitlab 11不支持多个extends，调整CI脚本结构
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml |  8 ++++----
 pulp.yml       | 43 +++++++++++--------------------------------
 2 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53be583..17629d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,16 +6,16 @@ variables:
   DOCKER_DRIVER: overlay2
   IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
 
-include:
-  - "/pulp.yml"
+include: "/pulp.yml"
 
 stages:
   - self-test
 
 self-test:
-  extends:
-    - .pulp-startup
+  extends: .pulp-startup
   stage: self-test
   image: centos:7.4.1708
   tags:
     - share
+  script:
+    - echo 1
diff --git a/pulp.yml b/pulp.yml
index c3d5041..b094acf 100644
--- a/pulp.yml
+++ b/pulp.yml
@@ -1,42 +1,21 @@
-.pulp-repo:
+.pulp-startup:
   variables:
     PULP_SERVER_HOST: repo.mesalab.cn
     PULP_SERVER_PORT: 443
 
-  script:
-    - yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-    - yum install -y wget
+  before_script:
+    - yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm wget
     - wget https://repos.fedorapeople.org/repos/pulp/pulp/rhel-pulp.repo -O /etc/yum.repos.d/rhel-pulp.repo
-
-.pulp-consumer-cfgfile:
-  script:
+    - yum install -y pulp-consumer-client pulp-rpm-consumer-extensions pulp-puppet-consumer-extensions pulp-agent pulp-rpm-handlers pulp-rpm-yumplugins pulp-puppet-handlers python-gofer-qpid
+    - yum install pulp-admin-client pulp-rpm-admin-extensions pulp-puppet-admin-extensions pulp-docker-admin-extensions
+      # Consumer tools
     - echo "[server]" >> consumer.conf.tmpfile
     - echo "host: $PULP_SERVER_HOST" >> consumer.conf.tmpfile
     - echo "port: $PULP_SERVER_PORT" >> consumer.conf.tmpfile
     - mv consumer.conf.tmpfile /etc/pulp/consumer/conf.d/server.conf
-
-.pulp-admin-cfgfile:
-  script:
-    - echo "[server]" >> consumer.conf.tmpfile
-    - echo "host: $PULP_SERVER_HOST" >> consumer.conf.tmpfile
-    - echo "port: $PULP_SERVER_PORT" >> consumer.conf.tmpfile
-    - mv consumer.conf.tmpfile /etc/pulp/admin/conf.d/server.conf
-
-.pulp-consumer-install:
-  extends: .pulp-repo-setup
-  script:
-    - yum install -y pulp-consumer-client pulp-rpm-consumer-extensions pulp-puppet-consumer-extensions pulp-agent pulp-rpm-handlers pulp-rpm-yumplugins pulp-puppet-handlers python-gofer-qpid
-
-.pulp-admin-install:
-  extends: .pulp-repo-setup
-  script:
-    - yum install pulp-admin-client pulp-rpm-admin-extensions pulp-puppet-admin-extensions pulp-docker-admin-extensions
-
-.pulp-startup:
-  extends:
-    - .pulp-consumer-install
-    - .pulp-admin-install
-    - .pulp-consumer-cfgfile
-    - .pulp-admin-cfgfile
-  scripts:
+      # Admin tools
+    - echo "[server]" >> admin.conf.tmpfile
+    - echo "host: $PULP_SERVER_HOST" >> admin.conf.tmpfile
+    - echo "port: $PULP_SERVER_PORT" >> admin.conf.tmpfile
+    - mv admin.conf.tmpfile /etc/pulp/admin/conf.d/server.conf
     - /usr/bin/goferd
-- 
cgit v1.2.3