mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-22 14:20:19 +00:00
ci: the "master" branch got renamed to "devel"
Closes: #1193 Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
parent
92913912ef
commit
1c2974d49e
@ -2,8 +2,8 @@ def cico_retries = 16
|
||||
def cico_retry_interval = 60
|
||||
def ci_git_repo = 'https://github.com/ceph/ceph-csi'
|
||||
def ci_git_branch = 'ci/centos'
|
||||
def ref = "master"
|
||||
def git_since = 'origin/master'
|
||||
def ref = "devel"
|
||||
def git_since = 'origin/devel'
|
||||
|
||||
node('cico-workspace') {
|
||||
stage('checkout ci repository') {
|
||||
|
@ -3,8 +3,8 @@ def cico_retry_interval = 60
|
||||
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'
|
||||
def ref = "master"
|
||||
def git_since = 'master'
|
||||
def ref = "devel"
|
||||
def git_since = 'devel'
|
||||
def workdir = '/opt/build/go/src/github.com/ceph/ceph-csi'
|
||||
def doc_change = 0
|
||||
// private, internal container image repository
|
||||
|
@ -12,7 +12,7 @@ spec:
|
||||
source:
|
||||
git:
|
||||
uri: https://github.com/ceph/ceph-csi
|
||||
ref: master
|
||||
ref: devel
|
||||
contextDir: .
|
||||
strategy:
|
||||
dockerStrategy:
|
||||
@ -38,7 +38,7 @@ spec:
|
||||
source:
|
||||
git:
|
||||
uri: https://github.com/ceph/ceph-csi
|
||||
ref: master
|
||||
ref: devel
|
||||
contextDir: .
|
||||
strategy:
|
||||
dockerStrategy:
|
||||
@ -64,7 +64,7 @@ spec:
|
||||
source:
|
||||
git:
|
||||
uri: https://github.com/ceph/ceph-csi
|
||||
ref: master
|
||||
ref: devel
|
||||
contextDir: .
|
||||
strategy:
|
||||
dockerStrategy:
|
||||
|
@ -1,7 +1,7 @@
|
||||
---
|
||||
- job:
|
||||
name: build-images
|
||||
description: Build container images from the master branch.
|
||||
description: Build container images from the devel branch.
|
||||
project-type: pipeline
|
||||
concurrent: false
|
||||
properties:
|
||||
@ -13,7 +13,7 @@
|
||||
# yamllint disable rule:line-length
|
||||
dsl: |
|
||||
def GIT_REPO = 'http://github.com/ceph/ceph-csi'
|
||||
def GIT_BRANCH = 'master'
|
||||
def GIT_BRANCH = 'devel'
|
||||
node {
|
||||
stage('checkout repository') {
|
||||
git url: "${GIT_REPO}", branch: "${GIT_BRANCH}", changelog: false
|
||||
@ -43,7 +43,7 @@
|
||||
name: origin
|
||||
url: https://github.com/ceph/ceph-csi
|
||||
branches:
|
||||
- master
|
||||
- devel
|
||||
triggers:
|
||||
- pollscm:
|
||||
cron: "H/5 * * * *"
|
||||
|
@ -3,8 +3,8 @@ def cico_retry_interval = 60
|
||||
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'
|
||||
def ref = "master"
|
||||
def git_since = 'master'
|
||||
def ref = "devel"
|
||||
def git_since = 'devel'
|
||||
def skip_e2e = 0
|
||||
def doc_change = 0
|
||||
def k8s_release = 'latest'
|
||||
|
@ -3,8 +3,8 @@ def cico_retry_interval = 60
|
||||
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'
|
||||
def ref = "master"
|
||||
def git_since = "master"
|
||||
def ref = "devel"
|
||||
def git_since = "devel"
|
||||
def skip_e2e = 0
|
||||
def doc_change = 0
|
||||
def k8s_release = 'latest'
|
||||
|
@ -3,8 +3,8 @@ def cico_retry_interval = 60
|
||||
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'
|
||||
def ref = "master"
|
||||
def git_since = 'master'
|
||||
def ref = "devel"
|
||||
def git_since = 'devel'
|
||||
def skip_e2e = 0
|
||||
def doc_change = 0
|
||||
def k8s_release = 'latest'
|
||||
|
@ -5,8 +5,8 @@ set -e -o pipefail
|
||||
# In case no value is specified, default values will be used.
|
||||
gitrepo="https://github.com/ceph/ceph-csi"
|
||||
workdir="tip/"
|
||||
ref="master"
|
||||
base="master"
|
||||
ref="devel"
|
||||
base="devel"
|
||||
history="no"
|
||||
|
||||
ARGUMENT_LIST=(
|
||||
|
@ -6,7 +6,7 @@
|
||||
# Usage: scripts/container-needs-rebuild.sh {test|devel} [git-since]
|
||||
#
|
||||
# - flavour is either 'test' or 'devel'
|
||||
# - the optional 'git-since' points to a git reference, 'origin/master' if
|
||||
# - the optional 'git-since' points to a git reference, 'origin/devel' if
|
||||
# not set
|
||||
#
|
||||
# Returns 0 in case changes do not affect the container image.
|
||||
@ -23,7 +23,7 @@ fi
|
||||
|
||||
GIT_SINCE="${2}"
|
||||
if [ -z "${GIT_SINCE}" ]; then
|
||||
GIT_SINCE='origin/master'
|
||||
GIT_SINCE='origin/devel'
|
||||
fi
|
||||
|
||||
MODIFIED_FILES=$(git diff --name-only "${GIT_SINCE}")
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
GIT_SINCE="${1}"
|
||||
if [ -z "${GIT_SINCE}" ]; then
|
||||
GIT_SINCE='origin/master'
|
||||
GIT_SINCE='origin/devel'
|
||||
fi
|
||||
|
||||
CHANGED_FILES=$(git diff --name-only "${GIT_SINCE}")
|
||||
|
@ -3,8 +3,8 @@ def cico_retry_interval = 60
|
||||
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'
|
||||
def ref = "master"
|
||||
def git_since = 'master'
|
||||
def ref = "devel"
|
||||
def git_since = 'devel'
|
||||
def skip_e2e = 0
|
||||
def doc_change = 0
|
||||
def k8s_release = 'latest'
|
||||
|
Loading…
Reference in New Issue
Block a user