diff options
| -rw-r--r-- | .gitlab-ci.yml | 45 | ||||
| -rw-r--r-- | ci/travis-tar.sh | 8 | ||||
| -rw-r--r-- | ci/travis.sh | 14 | ||||
| -rw-r--r-- | repo.internal.geedge.net.repo | 24 |
4 files changed, 67 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d8c764d..de0deca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,35 +1,52 @@ stages: - build - +- upload + +cache: + key: "$CI_COMMIT_REF_SLUG$CI_COMMIT_TAG" + paths: + - /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/build + .build_tar: - image: "git.mesalab.cn:7443/mesa_platform/build-env:self-test-env" + image: "ansible/ansible:centos7" variables: - GIT_STRATEGY: "clone" BUILD_PADDING_PREFIX: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/ - TESTING_VERSION_BUILD: 0 before_script: - - dockerd > /dev/null & - - docker info - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY + - cp repo.internal.geedge.net.repo /etc/yum.repos.d/repo.internal.geedge.net.repo - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/ - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH - pwd - - chmod +x ./ci/travis.sh + - chmod +x ./ci/travis-tar.sh script: - yum makecache + - ./ci/travis-tar.sh + tags: + - share + +.upload_tar: + image: "git.mesalab.cn:7443/mesa_platform/build-env:self-test-env" + before_script: + - pwd + - chmod +x ./ci/travis.sh + script: - ./ci/travis.sh tags: - share - + 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 only: - tags +rpm_upload: + stage: upload + variables: + PULP3_FILE_REPO_NAME: install-package-stable + PULP3_FILE_DIST_NAME: install-package-stable + extends: .upload_tar + dependencies: + - rpm_build + only: + - tags
\ No newline at end of file diff --git a/ci/travis-tar.sh b/ci/travis-tar.sh new file mode 100644 index 0000000..21e9b84 --- /dev/null +++ b/ci/travis-tar.sh @@ -0,0 +1,8 @@ +#!/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 diff --git a/ci/travis.sh b/ci/travis.sh index 8976be1..4eb1bf3 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -1,14 +1,8 @@ #!/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 +cd /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/build cp ~/file_upload_tools.py ./ +python3 file_upload_tools.py ${PULP3_FILE_REPO_NAME} ${PULP3_FILE_DIST_NAME} *.tar.gz -python3 file_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.tar.gz
\ No newline at end of file +cd / +rm -rf /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/build diff --git a/repo.internal.geedge.net.repo b/repo.internal.geedge.net.repo new file mode 100644 index 0000000..e1ffffa --- /dev/null +++ b/repo.internal.geedge.net.repo @@ -0,0 +1,24 @@ +[mesa-platform] +name=mesa-platform +baseurl=http://repo.internal.geedge.net/pulp/content/mesa-platform-stable/ +gpgcheck=0 + +[mesa-framework] +name=mesa-framework +baseurl=http://repo.internal.geedge.net/pulp/content/7/x86_64/stable/framework/ +gpgcheck=0 + +[platform] +name=platform +baseurl=http://repo.internal.geedge.net/pulp/content/7/x86_64/stable/platform/ +gpgcheck=0 + +[protocol] +name=protocol +baseurl=http://repo.internal.geedge.net/pulp/content/7/x86_64/stable/protocol/ +gpgcheck=0 + +[tsg] +name=tsg +baseurl=http://repo.internal.geedge.net/pulp/content/7/x86_64/stable/tsg/ +gpgcheck=0 |