diff options
| author | luwenpeng <[email protected]> | 2022-02-11 11:49:01 +0800 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2022-02-11 11:49:01 +0800 |
| commit | 0e1278184ce5b68f9d3a2dde3c44e946b8c6efd9 (patch) | |
| tree | a10eb14e08f359e13a8ff7605537cc5a9d614104 | |
| parent | dc77761918d44888f01c1e032e85c16254843f16 (diff) | |
TSG-xxx TFE运行CI时同时构建CentOS7/CentOS8运行环境的安装包 bugfixv4.6.04-20220211
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12e8336..a42b91e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,15 +44,10 @@ stages: .envelope_rpm_script: stage: envelope - variables: - FEATURE_ID: 100 - APP_NAME_IN_RPM_SPEC: tfe script: - - cat /etc/os-release - - export SYS_TYPE=`if [ $(cat /etc/os-release | grep SUPPORT_PRODUCT_VERSION | grep 7 | wc -l) -eq 1 ]; then echo \"el7\"; else echo \"el8\"; fi` - - echo $SYS_TYPE - ls $CI_PROJECT_DIR/build/*.rpm - - export RPM_FULL_PATH=`ls $CI_PROJECT_DIR/build/*.rpm | grep -v debug | grep -v debuginfo | grep -v devel | grep $SYS_TYPE | head -n 1` + - echo $TARGET_SYS_TYPE + - export RPM_FULL_PATH=`ls $CI_PROJECT_DIR/build/*.rpm | grep -v debug | grep -v devel | grep $TARGET_SYS_TYPE | head -n 1` - echo $RPM_FULL_PATH - export BIN_TO_PROTECT_IN_RPM="${INSTALL_PREFIX}/bin/tfe" - /root/rebuildrpm_and_envelope.sh $RPM_FULL_PATH $BIN_TO_PROTECT_IN_RPM $FEATURE_ID $APP_NAME_IN_RPM_SPEC @@ -168,6 +163,10 @@ release_build_release_for_centos7: envelope_rpm_for_centos7: image: $BUILD_IMAGE_CENTOS7 + variables: + FEATURE_ID: 100 + APP_NAME_IN_RPM_SPEC: tfe + TARGET_SYS_TYPE: el7 extends: .envelope_rpm_script upload_enveloped_rpm_for_centos7: @@ -267,6 +266,10 @@ release_build_release_for_centos8: envelope_rpm_for_centos8: image: $BUILD_IMAGE_CENTOS8 + variables: + FEATURE_ID: 100 + APP_NAME_IN_RPM_SPEC: tfe + TARGET_SYS_TYPE: el8 extends: .envelope_rpm_script upload_enveloped_rpm_for_centos8: |