diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11fe11d..dfc041e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,6 @@ variables: GIT_STRATEGY: "clone" BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ INSTALL_PREFIX: "/opt/tsg/tfe" - FRAMEWORK_REPO_ID: mesa-framework-stable - UPLOAD_TO_REPO_ID: mesa-framework-testing TESTING_VERSION_BUILD: 0 stages: @@ -12,9 +10,6 @@ stages: .build_by_travis: before_script: - - pulp-consumer -u $PULP_CI_USER -p $PULP_CI_PASSWORD register --consumer-id gitlab-ci-$CI_JOB_NAME-$CI_JOB_ID - - pulp-consumer rpm bind --repo-id $FRAMEWORK_REPO_ID - - pulp-admin login -u $PULP_CI_USER -p $PULP_CI_PASSWORD - 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 @@ -22,9 +17,6 @@ stages: script: - yum makecache - ./ci/travis.sh - after_script: - - pulp-admin logout - - pulp-consumer unregister tags: - share @@ -33,6 +25,7 @@ branch_build_debug: extends: .build_by_travis variables: BUILD_TYPE: Debug + PACKAGE: 0 except: - /^develop-.*$/i - /^release-.*$/i @@ -48,7 +41,7 @@ branch_build_release: - /^release-.*$/i - tags -testing_version_build_debug: +develop_build_debug: stage: build extends: .build_by_travis variables: @@ -56,15 +49,17 @@ testing_version_build_debug: UPLOAD_SYMBOL_FILES: 1 BUILD_TYPE: Debug PACKAGE: 1 + PULP3_REPO_NAME: tfe-4.2-testing + PULP3_DIST_NAME: tfe-4.2-testing artifacts: - name: "tfe-testing-$CI_COMMIT_REF_NAME-debug" + name: "tfe-develop-$CI_COMMIT_REF_NAME-debug" paths: - build/*.rpm only: - /^develop-.*$/i - /^release-.*$/i -testing_version_build_release: +develop_build_release: stage: build extends: .build_by_travis variables: @@ -72,21 +67,25 @@ testing_version_build_release: UPLOAD_SYMBOL_FILES: 1 BUILD_TYPE: RelWithDebInfo PACKAGE: 1 + PULP3_REPO_NAME: tfe-4.2-testing + PULP3_DIST_NAME: tfe-4.2-testing artifacts: - name: "tfe-testing-$CI_COMMIT_REF_NAME-release" + name: "tfe-release-$CI_COMMIT_REF_NAME-release" paths: - build/*.rpm only: - /^develop-.*$/i - /^release-.*$/i -product_build_debug: +release_build_debug: stage: build variables: UPLOAD_TO_REPO_ID: mesa-framework-stable UPLOAD_SYMBOL_FILES: 1 BUILD_TYPE: Debug PACKAGE: 1 + PULP3_REPO_NAME: tfe-4.2-stable + PULP3_DIST_NAME: tfe-4.2-stable extends: .build_by_travis artifacts: name: "tfe-install-$CI_COMMIT_REF_NAME-debug" @@ -95,13 +94,15 @@ product_build_debug: only: - tags -product_build_release: +release_build_release: stage: build variables: UPLOAD_TO_REPO_ID: mesa-framework-stable BUILD_TYPE: RelWithDebInfo UPLOAD_SYMBOL_FILES: 1 PACKAGE: 1 + PULP3_REPO_NAME: tfe-4.2-stable + PULP3_DIST_NAME: tfe-4.2-stable extends: .build_by_travis artifacts: name: "tfe-install-$CI_COMMIT_REF_NAME-release" diff --git a/ci/perpare_pulp3_netrc.sh b/ci/perpare_pulp3_netrc.sh new file mode 100644 index 0000000..8414bbb --- /dev/null +++ b/ci/perpare_pulp3_netrc.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env sh +set -evx +echo "machine ${PULP3_SERVER_URL}\nlogin ${PULP3_SERVER_LOGIN}\npassword ${PULP3_SERVER_PASSWORD}\n" > ~/.netrc diff --git a/ci/travis.sh b/ci/travis.sh index ad221e1..7c5f799 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -1,6 +1,7 @@ #!/usr/bin/env sh set -evx +chmod +x ci/get-nprocessors.sh . ci/get-nprocessors.sh # if possible, ask for the precise number of processors, @@ -11,6 +12,7 @@ if [ -x /usr/bin/getconf ]; then else NPROCESSORS=2 fi + # as of 2017-09-04 Travis CI reports 32 processors, but GCC build # crashes if parallelized too much (maybe memory consumption problem), # so limit to 4 processors for the time being. @@ -35,7 +37,7 @@ yum install -y mrzcpd framework numactl-devel zlib-devel librdkafka-devel system mkdir build || true cd build -cmake -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ +cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ -DTFE_VERSION_DAILY_BUILD=$TESTING_VERSION_BUILD \ @@ -46,8 +48,8 @@ make test if [ -n "${PACKAGE}" ]; then make package - pulp-admin rpm repo uploads rpm --repo-id ${UPLOAD_TO_REPO_ID} -d ./ - pulp-admin rpm repo publish run --repo-id ${UPLOAD_TO_REPO_ID} + cp ~/rpm_upload_tools.py ./ + python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm fi if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then