mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-01-18 02:39:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: use new duffy command for CentOS CI

Browse Source 
The `cico` command is getting deprecated, and the new `duffy` command
should be used instead. The new command requires a `~/.config/duffy`
file that contains an API endpoint and credentials.

See-also: https://sigs.centos.org/guide/ci/#installing-and-configuring-duffy-client
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2022-12-08 18:18:15 +01:00 committed by mergify[bot]
parent 69329b5592
commit 3880d642b9
6 changed files with 132 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
commitlint.groovy
View File

@ -1,10 +1,23 @@
def cico_retries = 16
def cico_retry_interval = 60
def duffy_pool = 'virt-ec2-t2-centos-8s-x86_64'
def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos'
def ref = "devel"
def git_since = 'origin/devel'
def create_duffy_config() {
writeFile(
file: '/home/jenkins/.config/duffy',
text: """client:
| url: https://duffy.ci.centos.org/api/v1
| auth:
| name: ceph-csi
| key: ${env.CICO_API_KEY}
|""".stripMargin()
)
}
node('cico-workspace') {
stage('checkout ci repository') {
git url: "${ci_git_repo}",
@ -13,18 +26,21 @@ node('cico-workspace') {
}
stage('reserve bare-metal machine') {
create_duffy_config()
def firstAttempt = true
retry(30) {
if (!firstAttempt) {
sleep(time: 5, unit: "MINUTES")
}
firstAttempt = false
cico = sh(
script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
def cmd = sh(
script: "duffy client request-session pool=${duffy_pool},quantity=1",
returnStdout: true
).trim().tokenize(' ')
env.CICO_NODE = "${cico[0]}.ci.centos.org"
env.CICO_SSID = "${cico[1]}"
)
def duffy = new groovy.json.JsonSlurper().parseText(cmd)
env.CICO_NODE = "${duffy.session.nodes[0].hostname}"
env.CICO_SSID = "${duffy.session.id}"
}
}
@ -47,7 +63,7 @@ node('cico-workspace') {
finally {
stage('return bare-metal machine') {
sh 'cico node done ${CICO_SSID}'
sh 'duffy client retire-session ${CICO_SSID}'
}
}
}

28
containerized-tests.groovy
View File

@ -1,5 +1,6 @@
def cico_retries = 16
def cico_retry_interval = 60
def duffy_pool = 'virt-ec2-t2-centos-8s-x86_64'
def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos'
def git_repo = 'https://github.com/ceph/ceph-csi'
@ -21,6 +22,18 @@ def podman_login(registry, username, passwd) {
ssh "podman login --authfile=~/.podman-auth.json --username='${username}' --password='${passwd}' ${registry}"
}
def create_duffy_config() {
writeFile(
file: '/home/jenkins/.config/duffy',
text: """client:
| url: https://duffy.ci.centos.org/api/v1
| auth:
| name: ceph-csi
| key: ${env.CICO_API_KEY}
|""".stripMargin()
)
}
// podman_pull pulls image from the source (CI internal) registry, and tags it
// as unqualified image name and into the destination registry. This prevents
// pulling from the destination registry.
@ -64,18 +77,21 @@ node('cico-workspace') {
}
stage('reserve bare-metal machine') {
create_duffy_config()
def firstAttempt = true
retry(30) {
if (!firstAttempt) {
sleep(time: 5, unit: "MINUTES")
}
firstAttempt = false
cico = sh(
script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
def cmd = sh(
script: "duffy client request-session pool=${duffy_pool},quantity=1",
returnStdout: true
).trim().tokenize(' ')
env.CICO_NODE = "${cico[0]}.ci.centos.org"
env.CICO_SSID = "${cico[1]}"
)
def duffy = new groovy.json.JsonSlurper().parseText(cmd)
env.CICO_NODE = "${duffy.session.nodes[0].hostname}"
env.CICO_SSID = "${duffy.session.id}"
}
}
@ -165,7 +181,7 @@ node('cico-workspace') {
finally {
stage('return bare-metal machine') {
sh 'cico node done ${CICO_SSID}'
sh 'duffy client retire-session ${CICO_SSID}'
}
}
}

28
k8s-e2e-external-storage.groovy
View File

@ -1,5 +1,6 @@
def cico_retries = 16
def cico_retry_interval = 60
def duffy_pool = 'virt-ec2-t2-centos-8s-x86_64'
def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos'
def git_repo = 'https://github.com/ceph/ceph-csi'
@ -20,6 +21,18 @@ def podman_login(registry, username, passwd) {
ssh "podman login --authfile=~/.podman-auth.json --username='${username}' --password='${passwd}' ${registry}"
}
def create_duffy_config() {
writeFile(
file: '/home/jenkins/.config/duffy',
text: """client:
| url: https://duffy.ci.centos.org/api/v1
| auth:
| name: ceph-csi
| key: ${env.CICO_API_KEY}
|""".stripMargin()
)
}
// podman_pull pulls image from the source (CI internal) registry, and tags it
// as unqualified image name and into the destination registry. This prevents
// pulling from the destination registry.
@ -89,18 +102,21 @@ node('cico-workspace') {
}
stage('reserve bare-metal machine') {
create_duffy_config()
def firstAttempt = true
retry(30) {
if (!firstAttempt) {
sleep(time: 5, unit: "MINUTES")
}
firstAttempt = false
cico = sh(
script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
def cmd = sh(
script: "duffy client request-session pool=${duffy_pool},quantity=1",
returnStdout: true
).trim().tokenize(' ')
env.CICO_NODE = "${cico[0]}.ci.centos.org"
env.CICO_SSID = "${cico[1]}"
)
def duffy = new groovy.json.JsonSlurper().parseText(cmd)
env.CICO_NODE = "${duffy.session.nodes[0].hostname}"
env.CICO_SSID = "${duffy.session.id}"
}
}
@ -192,7 +208,7 @@ node('cico-workspace') {
finally {
stage('return bare-metal machine') {
sh 'cico node done ${CICO_SSID}'
sh 'duffy client retire-session ${CICO_SSID}'
}
if (failure) {

28
mini-e2e-helm.groovy
View File

@ -1,5 +1,6 @@
def cico_retries = 16
def cico_retry_interval = 60
def duffy_pool = 'virt-ec2-t2-centos-8s-x86_64'
def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos'
def git_repo = 'https://github.com/ceph/ceph-csi'
@ -22,6 +23,18 @@ def podman_login(registry, username, passwd) {
ssh "podman login --authfile=~/.podman-auth.json --username='${username}' --password='${passwd}' ${registry}"
}
def create_duffy_config() {
writeFile(
file: '/home/jenkins/.config/duffy',
text: """client:
| url: https://duffy.ci.centos.org/api/v1
| auth:
| name: ceph-csi
| key: ${env.CICO_API_KEY}
|""".stripMargin()
)
}
// podman_pull pulls image from the source (CI internal) registry, and tags it
// as unqualified image name and into the destination registry. This prevents
// pulling from the destination registry.
@ -91,18 +104,21 @@ node('cico-workspace') {
}
stage('reserve bare-metal machine') {
create_duffy_config()
def firstAttempt = true
retry(30) {
if (!firstAttempt) {
sleep(time: 5, unit: "MINUTES")
}
firstAttempt = false
cico = sh(
script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
def cmd = sh(
script: "duffy client request-session pool=${duffy_pool},quantity=1",
returnStdout: true
).trim().tokenize(' ')
env.CICO_NODE = "${cico[0]}.ci.centos.org"
env.CICO_SSID = "${cico[1]}"
)
def duffy = new groovy.json.JsonSlurper().parseText(cmd)
env.CICO_NODE = "${duffy.session.nodes[0].hostname}"
env.CICO_SSID = "${duffy.session.id}"
}
}
@ -203,7 +219,7 @@ node('cico-workspace') {
finally {
stage('return bare-metal machine') {
sh 'cico node done ${CICO_SSID}'
sh 'duffy client retire-session ${CICO_SSID}'
}
if (failure) {

28
mini-e2e.groovy
View File

@ -1,5 +1,6 @@
def cico_retries = 16
def cico_retry_interval = 60
def duffy_pool = 'virt-ec2-t2-centos-8s-x86_64'
def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos'
def git_repo = 'https://github.com/ceph/ceph-csi'
@ -19,6 +20,18 @@ def podman_login(registry, username, passwd) {
ssh "podman login --authfile=~/.podman-auth.json --username='${username}' --password='${passwd}' ${registry}"
}
def create_duffy_config() {
writeFile(
file: '/home/jenkins/.config/duffy',
text: """client:
| url: https://duffy.ci.centos.org/api/v1
| auth:
| name: ceph-csi
| key: ${env.CICO_API_KEY}
|""".stripMargin()
)
}
// podman_pull pulls image from the source (CI internal) registry, and tags it
// as unqualified image name and into the destination registry. This prevents
// pulling from the destination registry.
@ -88,18 +101,21 @@ node('cico-workspace') {
}
stage('reserve bare-metal machine') {
create_duffy_config()
def firstAttempt = true
retry(30) {
if (!firstAttempt) {
sleep(time: 5, unit: "MINUTES")
}
firstAttempt = false
cico = sh(
script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
def cmd = sh(
script: "duffy client request-session pool=${duffy_pool},quantity=1",
returnStdout: true
).trim().tokenize(' ')
env.CICO_NODE = "${cico[0]}.ci.centos.org"
env.CICO_SSID = "${cico[1]}"
)
def duffy = new groovy.json.JsonSlurper().parseText(cmd)
env.CICO_NODE = "${duffy.session.nodes[0].hostname}"
env.CICO_SSID = "${duffy.session.id}"
}
}
@ -184,7 +200,7 @@ node('cico-workspace') {
finally {
stage('return bare-metal machine') {
sh 'cico node done ${CICO_SSID}'
sh 'duffy client retire-session ${CICO_SSID}'
}
if (failure) {

28
upgrade-tests.groovy
View File

@ -1,5 +1,6 @@
def cico_retries = 16
def cico_retry_interval = 60
def duffy_pool = 'virt-ec2-t2-centos-8s-x86_64'
def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos'
def git_repo = 'https://github.com/ceph/ceph-csi'
@ -19,6 +20,18 @@ def podman_login(registry, username, passwd) {
ssh "podman login --authfile=~/.podman-auth.json --username='${username}' --password='${passwd}' ${registry}"
}
def create_duffy_config() {
writeFile(
file: '/home/jenkins/.config/duffy',
text: """client:
| url: https://duffy.ci.centos.org/api/v1
| auth:
| name: ceph-csi
| key: ${env.CICO_API_KEY}
|""".stripMargin()
)
}
// podman_pull pulls image from the source (CI internal) registry, and tags it
// as unqualified image name and into the destination registry. This prevents
// pulling from the destination registry.
@ -88,18 +101,21 @@ node('cico-workspace') {
}
stage('reserve bare-metal machine') {
create_duffy_config()
def firstAttempt = true
retry(30) {
if (!firstAttempt) {
sleep(time: 5, unit: "MINUTES")
}
firstAttempt = false
cico = sh(
script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
def cmd = sh(
script: "duffy client request-session pool=${duffy_pool},quantity=1",
returnStdout: true
).trim().tokenize(' ')
env.CICO_NODE = "${cico[0]}.ci.centos.org"
env.CICO_SSID = "${cico[1]}"
)
def duffy = new groovy.json.JsonSlurper().parseText(cmd)
env.CICO_NODE = "${duffy.session.nodes[0].hostname}"
env.CICO_SSID = "${duffy.session.id}"
}
}
@ -188,7 +204,7 @@ node('cico-workspace') {
finally {
stage('return bare-metal machine') {
sh 'cico node done ${CICO_SSID}'
sh 'duffy client retire-session ${CICO_SSID}'
}
if (failure) {