diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acb39df..b08942b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -203,9 +203,9 @@ release_build_release_for_centos8: ############################################################################### # envelope ############################################################################### -.define_before_envelope_centos7: +.define_before_envelope_centos8: stage: envelope - extends: .build_by_travis_for_centos7 + extends: .build_by_travis_for_centos8 variables: BUILD_TYPE: RelWithDebInfo MEM_POOL: JEMALLOC_STATIC @@ -218,15 +218,8 @@ release_build_release_for_centos8: tags: - share -envelope_rpm_for_centos7: - extends: .define_before_envelope_centos7 - artifacts: - name: "$SYMBOL_TARGET-pr-$CI_COMMIT_REF_NAME-release" - paths: - - build/*-pr-*.rpm - envelope_rpm_for_centos8: - extends: .define_before_envelope_centos7 + extends: .define_before_envelope_centos8 image: $BUILD_IMAGE_CENTOS8 artifacts: name: "$SYMBOL_TARGET-pr-$CI_COMMIT_REF_NAME-release" @@ -325,14 +318,6 @@ rpm_upload_for_centos7: script: - python3 rpm_upload_tools.py $PULP3_REPO_NAME $PULP3_DIST_NAME *.rpm -envelope_rpm_upload_for_centos7: - extends: .define_before_upload_centos7 - dependencies: - - envelope_rpm_for_centos7 - script: - - python3 rpm_upload_tools.py $PULP3_REPO_NAME $PULP3_DIST_NAME *-pr-*.rpm - - .define_before_upload_centos8: stage: upload image: $BUILD_IMAGE_CENTOS8 |