Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3.7.6 - Bump sisl to fix object life counter. #637

Merged
merged 2 commits into from
Jan 28, 2025
Merged

v3.7.6 - Bump sisl to fix object life counter. #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e70054
v3.7.6 - Bump sisl to fix object life counter.
szmyd Jan 27, 2025
0d23cf1
Deploy on stable only.
szmyd Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 27 additions & 57 deletions .jenkins/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,19 @@ pipeline {
HUB_URL = 'hub.tess.io'
ARTIFACTORY_PASS = credentials('ARTIFACTORY_PASS')
CONAN_USER = 'oss'
TARGET_BRANCH = 'master'
STABLE_BRANCH = 'stable/v*'
LAST_COMMITS = ''
}

stages {
stage('Adjust Tag for Master') {
when { not {
branch "${STABLE_BRANCH}"
} }
steps {
script {
sh(script: "sed -Ei 's,version = .*\"([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+).*,version = \"\\1-${env.BUILD_NUMBER}\",' conanfile.py")
LAST_COMMITS = sh(script: "git log -n 2 --pretty=short", returnStdout: true)
}
}
}
stage('Include build missing') {
steps {
script {
BUILD_MISSING = "--build missing"
}
}
}

stage('Get Version') {
steps {
script {
PROJECT = sh(script: "grep -m 1 'name =' conanfile.py | awk '{print \$3}' | tr -d '\n' | tr -d '\"'", returnStdout: true)
VER = sh(script: "grep -m 1 'version =' conanfile.py | awk '{print \$3}' | tr -d '\n' | tr -d '\"'", returnStdout: true)
CONAN_CHANNEL = sh(script: "echo ${BRANCH_NAME} | sed -E 's,(\\w+-?\\d*)/.*,\\1,' | sed -E 's,-,_,' | tr -d '\n'", returnStdout: true)
SANITIZED_BRANCH = sh(script: "echo ${BRANCH_NAME} | sed -E 's,(\\w+-?\\d*)/.*,\\1,' | sed -E 's,-,_,' | tr -d '\n'", returnStdout: true)
HUB_PATH = "${HUB_URL}/${ORG}/${PROJECT}"
TAG = "${VER}@${CONAN_USER}/${CONAN_CHANNEL}"
slackSend color: '#0063D1', channel: '#sds-ci', message: "*${PROJECT}/${TAG}* is building."
env.pkg_version = "${PROJECT}/${TAG}"
}
}
}

stage('Tag Stable Build') {
when { branch "${STABLE_BRANCH}" }
steps {
script {
TAG = "${VER}@"
slackSend color: '#0063D1', channel: '#sds-ci', message: "*${PROJECT}/${SANITIZED_BRANCH}* is building."
}
}
}
Expand All @@ -66,50 +35,51 @@ pipeline {
}

stages {
stage('Adjust Tag for Master') {
stage("Refresh Locks") {
when { not {
branch "${STABLE_BRANCH}"
} }
steps {
sh(script: "sed -Ei 's,version = .*\"([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+).*,version = \"\\1-${env.BUILD_NUMBER}\",' conanfile.py")
script {
sh "./update_locks.sh"
}
}
}

stage("Build") {
steps {
script {
def PRERELEASE = 'True'
def BUILD_PROFILE = "${BUILD_TYPE}"
def SANITIZE = 'False'

if ("${BUILD_TYPE}" == "release") {
PRERELEASE = 'False'
BUILD_PROFILE = "test"
sh "conan create --lockfile locks/${BUILD_TYPE}_deps.lock ."
sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/test_load' -exec cp {} .jenkins/test_load \\;"
sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/test_volume' -exec cp {} .jenkins/test_volume \\;"
sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/check_btree' -exec cp {} .jenkins/check_btree \\;"
sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/test_log_store' -exec cp {} .jenkins/test_log_store \\;"
sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/test_meta_blk_mgr' -exec cp {} .jenkins/test_meta_blk_mgr \\;"
sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/hs_svc_tool ' -exec cp {} .jenkins/hs_svc_tool \\;"
sh "find . -type f -wholename '*test_scripts/vol_test.py' -exec cp -a {} .jenkins/vol_test.py \\;"
sh "find ${CONAN_USER_HOME} -type d -wholename '*bin/scripts' -exec cp -a {} .jenkins/scripts \\;"
sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/test_log_store' -exec cp {} .jenkins/test_log_store \\;"
withDockerRegistry([credentialsId: 'sds-sds', url: "https://${HUB_URL}"]) {
sh "docker build -t ${HUB_PATH}:${CONAN_CHANNEL}-${BUILD_TYPE} .jenkins/"
}

sh "conan create -u ${BUILD_MISSING} -o ${PROJECT}:testing=epoll_mode -o sisl:prerelease=${PRERELEASE} -pr ${BUILD_PROFILE} . ${PROJECT}/${TAG} ; \
find ${CONAN_USER_HOME} -type f -wholename '*bin/test_load' -exec cp {} .jenkins/test_load \\; ; \
find ${CONAN_USER_HOME} -type f -wholename '*bin/test_volume' -exec cp {} .jenkins/test_volume \\; ; \
find ${CONAN_USER_HOME} -type f -wholename '*bin/check_btree' -exec cp {} .jenkins/check_btree \\; ; \
find ${CONAN_USER_HOME} -type f -wholename '*bin/test_log_store' -exec cp {} .jenkins/test_log_store \\; ; \
find ${CONAN_USER_HOME} -type f -wholename '*bin/test_meta_blk_mgr' -exec cp {} .jenkins/test_meta_blk_mgr \\; ; \
find ${CONAN_USER_HOME} -type f -wholename '*bin/hs_svc_tool ' -exec cp {} .jenkins/hs_svc_tool \\; ; \
find . -type f -wholename '*test_scripts/vol_test.py' -exec cp -a {} .jenkins/vol_test.py \\; ; \
find ${CONAN_USER_HOME} -type d -wholename '*bin/scripts' -exec cp -a {} .jenkins/scripts \\; ; \
find ${CONAN_USER_HOME} -type f -wholename '*bin/test_log_store' -exec cp {} .jenkins/test_log_store \\;"
}
}
}

stage("Deploy Package") {
when { allOf {
branch "${STABLE_BRANCH}"
expression { "${BUILD_TYPE}" != 'coverage' }
expression { "${BUILD_TYPE}" != 'sanitize' }
} }
steps {
sh "conan user -r ebay-local -p ${ARTIFACTORY_PASS} _service_sds"
sh "conan upload ${PROJECT}/${TAG} -c --all -r ebay-local"
sh "conan upload ${PROJECT}/${VER}@ -c --all -r ebay-local"
}
}
stage("Image") {
steps {
withDockerRegistry([credentialsId: 'sds-sds', url: "https://${HUB_URL}"]) {
sh "docker build -t ${HUB_PATH}:${CONAN_CHANNEL}-${BUILD_TYPE} .jenkins/"
sh "docker push ${HUB_PATH}:${CONAN_CHANNEL}-${BUILD_TYPE}"
}
}
Expand All @@ -126,10 +96,10 @@ pipeline {

post {
failure {
slackSend color: '#E43237', channel: '#${PROJECT}-build', message: "@here ${PROJECT} build *${PROJECT}/${TAG}* has had a failure : ${BUILD_URL}"
slackSend color: '#E43237', channel: '#${PROJECT}-build', message: "@here ${PROJECT} build *${PROJECT}/${SANITIZED_BRANCH}* has had a failure : ${BUILD_URL}"
}
success {
slackSend color: '#85B717', channel: '#sds-ci', message: "*${PROJECT}/${TAG}* has completed successfully."
slackSend color: '#85B717', channel: '#sds-ci', message: "*${PROJECT}/${SANITIZED_BRANCH}* has completed successfully."
}
}
}
7 changes: 4 additions & 3 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

class HomestoreConan(ConanFile):
name = "homestore"
version = "3.7.5"
version = "3.7.6"

homepage = "https://github.corp.ebay.com/SDS/homestore"
description = "HomeStore"
Expand All @@ -28,6 +28,7 @@ class HomestoreConan(ConanFile):
'testing': 'epoll_mode',
'skip_testing': False,
'sisl:prerelease': True,
"pistache:with_ssl": True,
}


Expand All @@ -54,8 +55,8 @@ def build_requirements(self):
self.build_requires("gtest/1.12.1")

def requirements(self):
self.requires("iomgr/[~=8]")
self.requires("sisl/[~=8]")
self.requires("iomgr/8.8.1")
self.requires("sisl/8.9.1")

# FOSS, rarely updated
self.requires("boost/1.79.0")
Expand Down
Loading
Loading