Update .gitlab-ci.yml

1 files changed, 10 insertions, 40 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d274b19..6e6709f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ variables:
   GIT_STRATEGY: "clone"
   BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
   INSTALL_PREFIX: "/opt/MESA/lib/"
-  INSTALL_DEPENDENCY_LIBRARY:  libasan
+  INSTALL_DEPENDENCY_LIBRARY:  ""
 
 stages:
 - build
@@ -50,6 +50,10 @@ develop_build_debug:
   variables:
     BUILD_TYPE: Debug
     PACKAGE: 1
+    UPLOAD_RPM: 1
+    ASAN_OPTION: ADDRESS
+    PULP3_REPO_NAME: framework-testing-x86_64.el7
+    PULP3_DIST_NAME: framework-testing-x86_64.el7
   artifacts:
     name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-debug"
     paths:
@@ -65,6 +69,10 @@ develop_build_release:
   variables:
     BUILD_TYPE: RelWithDebInfo
     PACKAGE: 1
+    UPLOAD_RPM: 1
+    ASAN_OPTION: ADDRESS
+    PULP3_REPO_NAME: framework-testing-x86_64.el7
+    PULP3_DIST_NAME: framework-testing-x86_64.el7
   artifacts:
     name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
     paths:
@@ -90,8 +98,6 @@ release_build_debug:
       - build/*.rpm
   only:
     - tags
-  except:
-    - /^v[0-9].*-testing$/i    
 
 release_build_release:
   stage: build
@@ -109,40 +115,4 @@ release_build_release:
     paths:
       - build/*.rpm
   only:
-    - tags
-  except:
-    - /^v[0-9].*-testing$/i    
-
-testing_build_debug:
-  stage: build
-  variables:
-    BUILD_TYPE: Debug
-    PACKAGE: 1
-    UPLOAD_RPM: 1
-    ASAN_OPTION: ADDRESS
-    PULP3_REPO_NAME: framework-testing-x86_64.el7
-    PULP3_DIST_NAME: framework-testing-x86_64.el7
-  extends: .build_by_travis
-  artifacts:
-    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-  only:
-    - /^v[0-9].*-testing$/i   
-
-testing_build_release:
-  stage: build
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    PACKAGE: 1
-    UPLOAD_RPM: 1
-    ASAN_OPTION: ADDRESS
-    PULP3_REPO_NAME: framework-testing-x86_64.el7
-    PULP3_DIST_NAME: framework-testing-x86_64.el7
-  extends: .build_by_travis
-  artifacts:
-    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-  only:
-    - /^v[0-9].*-testing$/i  
\ No newline at end of file
+    - tags
\ No newline at end of file