diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0505e02..7416014 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,8 @@ 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-centos7 - build-rockylinux8 cache: @@ -56,25 +54,6 @@ images_build: - docker build -t $SERVER_DNS_IMAGE_TAG -f ./images_build/server_dns/Dockerfile ./images_build/server_dns/ - docker save $SERVER_DNS_IMAGE_TAG > images/tsg_diagnose_server_dns.tar - -feature_branch_build_centos7: - image: $BUILD_BASED_IMAGE_CENTOS7 - stage: build-centos7 - 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-rockylinux8 @@ -93,26 +72,6 @@ feature_branch_build_rockylinux8: - /^rel-.*$/i - /^master.*$/i - -develop_build_centos7: - image: $BUILD_BASED_IMAGE_CENTOS7 - stage: build-centos7 - variables: - PACKAGE: 1 - UPLOAD: 1 - TESTING_VERSION_BUILD: 1 - PULP3_RPM_REPO_NAME: tsg-testing-x86_64.el7 - PULP3_RPM_DIST_NAME: tsg-testing-x86_64.el7 - extends: .build_rpm - script: - - ./ci/travis.sh - dependencies: - - images_build - only: - - /^dev-.*$/i - - /^rel-.*$/i - - /^master.*$/i - develop_build_rockylinux8: image: $BUILD_BASED_IMAGE_ROCKYLINUX8 stage: build-rockylinux8 @@ -132,22 +91,6 @@ develop_build_rockylinux8: - /^rel-.*$/i - /^master.*$/i -release_build_centos7: - image: $BUILD_BASED_IMAGE_CENTOS7 - stage: build-centos7 - variables: - PACKAGE: 1 - UPLOAD: 1 - PULP3_RPM_REPO_NAME: tsg-stable-x86_64.el7 - PULP3_RPM_DIST_NAME: tsg-stable-x86_64.el7 - extends: .build_rpm - script: - - ./ci/travis.sh - dependencies: - - images_build - only: - - tags - release_build_rockylinux8: image: $BUILD_BASED_IMAGE_ROCKYLINUX8 stage: build-rockylinux8