diff options
| author | luwenpeng <[email protected]> | 2021-10-20 10:44:23 +0300 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2021-10-30 17:29:37 +0300 |
| commit | d9dc91bc98cab9d3ba4e2f520e2cf5a918c6f710 (patch) | |
| tree | be0b52329db91062d7bc680dfbc8cb1b3a7ec8c6 | |
| parent | 665c47295a330887e76f61fe1f804913d4c48770 (diff) | |
TSG-8097 TFE的CI构建流程适配加壳功能v4.5.20-202110
| -rw-r--r-- | .gitlab-ci.yml | 36 | ||||
| -rw-r--r-- | ci/travis.sh | 2 |
2 files changed, 37 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b17169..6d50724 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,8 @@ variables: stages: - build +- envelope +- upload .build_by_travis: before_script: @@ -109,3 +111,37 @@ release_build_release: - build/*.rpm only: - tags + +envelope_rpm: + stage: envelope + variables: + FEATURE_ID: 100 + APP_NAME_IN_RPM_SPEC: tfe + script: + - export RPM_FULL_PATH=`ls $CI_PROJECT_DIR/build/*.rpm | grep -v debug | grep -v debuginfo | grep -v devel | head -n 1` + - 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 + tags: + - envelope + artifacts: + name: "tfe-pr-$CI_COMMIT_REF_NAME-release" + paths: + - build/*-pr-*.rpm + only: + - tags + +upload_envelope_rpm: + stage: upload + variables: + PULP3_REPO_NAME: tfe-stable-x86_64.el7 + PULP3_DIST_NAME: tfe-stable-x86_64.el7 + script: + - cd $CI_PROJECT_DIR/build/ + - ls -ahl *.rpm + - cp ~/rpm_upload_tools.py ./ + - python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *-pr-*.rpm + - rm -rf *.rpm + tags: + - share + only: + - tags diff --git a/ci/travis.sh b/ci/travis.sh index 19470d9..7744474 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -57,7 +57,7 @@ make make test if [ -n "${PACKAGE}" ]; then - make package + make package cp ~/rpm_upload_tools.py ./ python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm fi |