<HTML><BODY><div>LGTM<br> <blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">Вторник, 14 апреля 2020, 17:55 +03:00 от Alexander V. Tikhonov <avtikhon@tarantool.org>:<br> <div id=""><div class="js-helper js-readmsg-msg"><style type="text/css"></style><div><div id="style_15868761081924671208_BODY">Moved sources tarball creation from travis-ci to gitlab-ci,<br>moved its jobs for sources packing and sources deploying.<br><br>Close #4895<br>---<br><br>Github: <a href="https://github.com/tarantool/tarantool/tree/avtikhon/gh-4895-sources-to-gitlab-full-ci" target="_blank">https://github.com/tarantool/tarantool/tree/avtikhon/gh-4895-sources-to-gitlab-full-ci</a><br>Issue: <a href="https://github.com/tarantool/tarantool/issues/4895" target="_blank">https://github.com/tarantool/tarantool/issues/4895</a><br><br> .gitlab-ci.yml | 12 +++++++++++-<br> .gitlab.mk | 22 +++++++++++++++++-----<br> .travis.mk | 32 --------------------------------<br> .travis.yml | 20 --------------------<br> 4 files changed, 28 insertions(+), 58 deletions(-)<br><br>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml<br>index cd710027f..a37c1ba6b 100644<br>--- a/.gitlab-ci.yml<br>+++ b/.gitlab-ci.yml<br>@@ -261,7 +261,12 @@ remove_images:<br> script:<br> - ${GITLAB_MAKE} perf_cleanup<br> <br>-# Packs<br>+# Packages and sources<br>+<br>+sources:<br>+ <<: *pack_definition<br>+ script:<br>+ - ${GITLAB_MAKE} source<br> <br> centos_6:<br> <<: *pack_definition<br>@@ -355,6 +360,11 @@ debian_10:<br> <br> # Deploy<br> <br>+sources_deploy:<br>+ <<: *deploy_definition<br>+ script:<br>+ - ${GITLAB_MAKE} source_deploy<br>+<br> centos_6_deploy:<br> <<: *deploy_definition<br> variables:<br>diff --git a/.gitlab.mk b/.gitlab.mk<br>index 9c0b85cfe..7079b489c 100644<br>--- a/.gitlab.mk<br>+++ b/.gitlab.mk<br>@@ -110,17 +110,22 @@ vms_test_%:<br> vms_shutdown:<br> VBoxManage controlvm ${VMS_NAME} poweroff<br> <br>-# ########<br>-# Packages<br>-# ########<br>+# ######<br>+# Deploy<br>+# ######<br> <br> GIT_DESCRIBE=$(shell git describe HEAD)<br> MAJOR_VERSION=$(word 1,$(subst ., ,$(GIT_DESCRIBE)))<br> MINOR_VERSION=$(word 2,$(subst ., ,$(GIT_DESCRIBE)))<br> BUCKET="$(MAJOR_VERSION).$(MINOR_VERSION)"<br> <br>-package: git_submodule_update<br>- git clone <a href="https://github.com/packpack/packpack.git" target="_blank">https://github.com/packpack/packpack.git</a> packpack<br>+deploy_prepare: git_submodule_update<br>+ pip install awscli --user<br>+ [ -d packpack ] || \<br>+ git clone <a href="https://github.com/packpack/packpack.git" target="_blank">https://github.com/packpack/packpack.git</a> packpack<br>+ rm -rf build<br>+<br>+package: deploy_prepare<br> PACKPACK_EXTRA_DOCKER_RUN_PARAMS='--network=host' ./packpack/packpack<br> <br> deploy: package<br>@@ -132,6 +137,13 @@ deploy: package<br> -b="${RELEASE_REPO_S3_DIR}/${BUCKET}" build ; \<br> fi<br> <br>+source: deploy_prepare<br>+ TARBALL_COMPRESSOR=gz packpack/packpack tarball<br>+<br>+source_deploy: source<br>+ aws --endpoint-url "${AWS_S3_ENDPOINT_URL}" s3 cp build/*.tar.gz \<br>+ "s3://tarantool.${BUCKET}.src/" --acl public-read<br>+<br> # ###################<br> # Performance testing<br> # ###################<br>diff --git a/.travis.mk b/.travis.mk<br>index f709a18b6..ad09ea6ad 100644<br>--- a/.travis.mk<br>+++ b/.travis.mk<br>@@ -211,35 +211,3 @@ test_freebsd_no_deps: build_freebsd<br> cd test && python2.7 test-run.py --force $(TEST_RUN_EXTRA_PARAMS)<br> <br> test_freebsd: deps_freebsd test_freebsd_no_deps<br>-<br>-####################<br>-# Sources tarballs #<br>-####################<br>-<br>-source:<br>- git clone <a href="https://github.com/packpack/packpack.git" target="_blank">https://github.com/packpack/packpack.git</a> packpack<br>- TARBALL_COMPRESSOR=gz packpack/packpack tarball<br>-<br>-# Push alpha and beta versions to <major>x bucket (say, 2x),<br>-# stable to <major>.<minor> bucket (say, 2.2).<br>-ifeq ($(TRAVIS_BRANCH),master)<br>-GIT_DESCRIBE=$(shell git describe HEAD)<br>-MAJOR_VERSION=$(word 1,$(subst ., ,$(GIT_DESCRIBE)))<br>-MINOR_VERSION=$(word 2,$(subst ., ,$(GIT_DESCRIBE)))<br>-else<br>-MAJOR_VERSION=$(word 1,$(subst ., ,$(TRAVIS_BRANCH)))<br>-MINOR_VERSION=$(word 2,$(subst ., ,$(TRAVIS_BRANCH)))<br>-endif<br>-BUCKET=tarantool.$(MAJOR_VERSION).$(MINOR_VERSION).src<br>-ifeq ($(MINOR_VERSION),0)<br>-BUCKET=tarantool.$(MAJOR_VERSION)x.src<br>-endif<br>-ifeq ($(MINOR_VERSION),1)<br>-BUCKET=tarantool.$(MAJOR_VERSION)x.src<br>-endif<br>-<br>-source_deploy:<br>- pip install awscli --user<br>- aws --endpoint-url "${AWS_S3_ENDPOINT_URL}" s3 \<br>- cp build/*.tar.gz "s3://${BUCKET}/" \<br>- --acl public-read<br>diff --git a/.travis.yml b/.travis.yml<br>index c63ab3ebd..593ef7474 100644<br>--- a/.travis.yml<br>+++ b/.travis.yml<br>@@ -34,9 +34,6 @@ jobs:<br> - name: "Debug build + test + coverage (Linux, gcc)"<br> env: TARGET=coverage<br> # Deploy targets (they also catch distro-specific problems).<br>- - name: "Create and deploy tarball"<br>- env: TARGET=source<br>- if: branch = "master"<br> - name: "CentOS 6 build + deploy RPM"<br> env: OS=el DIST=6<br> if: branch = "master"<br>@@ -102,14 +99,6 @@ deploy:<br> repo: tarantool/tarantool<br> branch: "master"<br> condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"<br>- # Deploy source tarballs to S3 from master branch (w/o tagged revisions)<br>- - provider: script<br>- script: make -f .travis.mk source_deploy<br>- skip_cleanup: true<br>- on:<br>- repo: tarantool/tarantool<br>- branch: "master"<br>- condition: "x${TARGET} = xsource"<br> # Deploy packages to PackageCloud from tagged revisions<br> # <a href="https://github.com/travis-ci/travis-ci/issues/7780#issuecomment-302389370" target="_blank">https://github.com/travis-ci/travis-ci/issues/7780#issuecomment-302389370</a><br> - provider: packagecloud<br>@@ -123,15 +112,6 @@ deploy:<br> repo: tarantool/tarantool<br> tags: true<br> condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"<br>- # Deploy source tarballs to S3 from tagged revisions<br>- # <a href="https://github.com/travis-ci/travis-ci/issues/7780#issuecomment-302389370" target="_blank">https://github.com/travis-ci/travis-ci/issues/7780#issuecomment-302389370</a><br>- - provider: script<br>- script: make -f .travis.mk source_deploy<br>- skip_cleanup: true<br>- on:<br>- repo: tarantool/tarantool<br>- tags: true<br>- condition: "x${TARGET} = xsource"<br> <br> notifications:<br> email:<br>--<br>2.17.1<br> </div></div></div></div></blockquote> <div> </div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Oleg Piskunov</div></div></div><div> </div></div></BODY></HTML>