From 480eb4dfd40809b8d02ca8caa197b7ab5ed7e52a Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Wed, 6 Apr 2022 15:36:56 +0800
Subject: [PATCH] =?UTF-8?q?feature:=E8=87=AA=E6=A3=80rpm=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E9=80=82=E9=85=8Dcentos7=E5=92=8Crockylinux8.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 70 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5650be..b207bde 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,7 @@
+variables:
+  BUILD_BASED_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master"
+  BUILD_BASED_IMAGE_ROCKYLINUX8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
+
 stages:
 - prebuild
 - build
@@ -18,15 +22,11 @@ cache:
     - share
     
 .build_rpm:
-  image: "git.mesalab.cn:7443/mesa_platform/build-env:self-test-env"
   variables:
     GIT_STRATEGY: "clone"
     BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
     TESTING_VERSION_BUILD: 0
   before_script:
-    - dockerd > /dev/null &
-    - docker info
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/
     - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
     - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
@@ -56,7 +56,26 @@ images_build:
     - docker save $SERVER_DNS_IMAGE_TAG > images/server_dns.tar
 
 
-feature_branch_build:
+feature_branch_build_centos7:
+  image: $BUILD_BASED_IMAGE_CENTOS7
+  stage: build
+  variables:
+    PACKAGE: 1
+    TESTING_VERSION_BUILD: 1
+  extends: .build_rpm
+  script:
+    - ls -halt ./scripts
+    - ./ci/travis.sh
+  dependencies:
+    - images_build
+  except:
+    - tags
+    - /^dev-.*$/i
+    - /^rel-.*$/i
+    - /^master.*$/i
+
+feature_branch_build_rockylinux8:
+  image: $BUILD_BASED_IMAGE_ROCKYLINUX8
   stage: build
   variables:
     PACKAGE: 1
@@ -74,7 +93,8 @@ feature_branch_build:
     - /^master.*$/i
 
 
-develop_build:
+develop_build_centos7:
+  image: $BUILD_BASED_IMAGE_CENTOS7
   stage: build
   variables:
     PACKAGE: 1
@@ -92,7 +112,27 @@ develop_build:
     - /^rel-.*$/i
     - /^master.*$/i
 
-release_build:
+develop_build_rockylinux8:
+  image: $BUILD_BASED_IMAGE_ROCKYLINUX8
+  stage: build
+  variables:
+    PACKAGE: 1
+    UPLOAD: 1
+    TESTING_VERSION_BUILD: 1
+    PULP3_RPM_REPO_NAME: tsg-testing-x86_64.el8
+    PULP3_RPM_DIST_NAME: tsg-testing-x86_64.el8
+  extends: .build_rpm
+  script:
+    - ./ci/travis.sh
+  dependencies:
+    - images_build
+  only:
+    - /^dev-.*$/i
+    - /^rel-.*$/i
+    - /^master.*$/i
+
+release_build_centos7:
+  image: $BUILD_BASED_IMAGE_CENTOS7
   stage: build
   variables:
     PACKAGE: 1
@@ -106,3 +146,19 @@ release_build:
     - images_build
   only:
     - tags
+
+release_build_rockylinux8:
+  image: $BUILD_BASED_IMAGE_ROCKYLINUX8
+  stage: build
+  variables:
+    PACKAGE: 1
+    UPLOAD: 1
+    PULP3_RPM_REPO_NAME: tsg-stable-x86_64.el8
+    PULP3_RPM_DIST_NAME: tsg-stable-x86_64.el8
+  extends: .build_rpm
+  script:
+    - ./ci/travis.sh
+  dependencies:
+    - images_build
+  only:
+    - tags
\ No newline at end of file