diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ad651c..d8c764d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,11 +26,10 @@ rpm_build: stage: build variables: VER_NAME: $CI_COMMIT_REF_NAME + PULP3_REPO_NAME: install-package-stable + PULP3_DIST_NAME: install-package-stable + extends: .build_tar - artifacts: - name: "tsg-scripts-$CI_COMMIT_REF_NAME" - paths: - - build/*.tar.gz only: - tags diff --git a/build_config/group_vars/local.yml b/build_config/group_vars/local.yml index 9dd6a22..f0f327a 100644 --- a/build_config/group_vars/local.yml +++ b/build_config/group_vars/local.yml @@ -1,9 +1,3 @@ -rpmdict: - selftest: - fullname: "self-test-ci_test_rpm-1.el7.x86_64.rpm" - name: "self-test" - downpath: "/tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/rpms" - dockerImages: - name: "git.mesalab.cn:7443/tsg/tsg-diagnose/unittest" tag: latest diff --git a/ci/travis.sh b/ci/travis.sh index e88e5fc..8eca49b 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -1,6 +1,14 @@ #!/usr/bin/env sh mkdir build || true +cat ./customize.yml >> ./build_config/group_vars/local.yml +cat ./customize.yml >> ./install_config/group_vars/all.yml + ansible-playbook -i ./build_config -e tarname=tsg-scripts-${VER_NAME}.tar.gz buildPackage.yml ls -halt ./build/tsg-scripts-${VER_NAME}.tar.gz + +cd build +cp ~/rpm_upload_tools.py ./ + +python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.tar.gz \ No newline at end of file diff --git a/customize.yml b/customize.yml new file mode 100644 index 0000000..c985bb0 --- /dev/null +++ b/customize.yml @@ -0,0 +1,5 @@ +rpmdict: + selftest: + fullname: "self-test-ci_test_rpm-1.el7.x86_64.rpm" + name: "self-test" + downpath: "/tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/self-test/files/rpms" \ No newline at end of file