diff options
| author | luwenpeng <[email protected]> | 2021-10-20 10:44:23 +0300 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2021-10-20 19:35:11 +0300 |
| commit | b996036f8536063aeb5581a2f1da17c88a7b3b98 (patch) | |
| tree | e5e1dc48cce35929a95a5d76306eaa7bcd468df8 | |
| parent | c3cead1d8430354125b0f56e8eb84108af0dbcde (diff) | |
TSG-8097 TFE的CI构建流程适配加壳功能v4.5.18-202110
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | ci/travis.sh | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b17169..e4e5cf8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "git.mesalab.cn:7443/mesa_platform/build-env:master" +image: "git.mesalab.cn:7443/mesa_platform/build-env:envelope-env" variables: GIT_STRATEGY: "clone" BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ @@ -102,6 +102,8 @@ release_build_release: PACKAGE: 1 PULP3_REPO_NAME: tfe-stable-x86_64.el7 PULP3_DIST_NAME: tfe-stable-x86_64.el7 + FEATURE_ID: 100 + ENVELOPE: 1 extends: .build_by_travis artifacts: name: "tfe-install-$CI_COMMIT_REF_NAME-release" diff --git a/ci/travis.sh b/ci/travis.sh index 19470d9..7360caf 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -57,7 +57,16 @@ make make test if [ -n "${PACKAGE}" ]; then - make package + make package + + if [ $ENVELOPE ];then + ORIG_RPM_NAME=`ls *.rpm | grep -v debug | head -n 1` + ORIG_RPM_PATH=`readlink -f ${ORIG_RPM_NAME}` + ORIG_RPM_BIN="${INSTALL_PREFIX}/bin/tfe" + ORIG_RPM_SPECS="tfe.spec" + APP_FEATURE_ID=$FEATURE_ID + /root/rebuildrpm_and_envelope.sh $ORIG_RPM_NAME $ORIG_RPM_PATH $ORIG_RPM_BIN $ORIG_RPM_SPECS $APP_FEATURE_ID + fi cp ~/rpm_upload_tools.py ./ python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm fi |