ci: the "master" branch got renamed to "devel"

Closes: #1193
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-02-25 09:23:57 +01:00 committed by mergify[bot]
parent 92913912ef
commit 1c2974d49e
11 changed files with 23 additions and 23 deletions

View File

@ -2,8 +2,8 @@ def cico_retries = 16
def cico_retry_interval = 60 def cico_retry_interval = 60
def ci_git_repo = 'https://github.com/ceph/ceph-csi' def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos' def ci_git_branch = 'ci/centos'
def ref = "master" def ref = "devel"
def git_since = 'origin/master' def git_since = 'origin/devel'
node('cico-workspace') { node('cico-workspace') {
stage('checkout ci repository') { stage('checkout ci repository') {

View File

@ -3,8 +3,8 @@ def cico_retry_interval = 60
def ci_git_repo = 'https://github.com/ceph/ceph-csi' def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos' def ci_git_branch = 'ci/centos'
def git_repo = 'https://github.com/ceph/ceph-csi' def git_repo = 'https://github.com/ceph/ceph-csi'
def ref = "master" def ref = "devel"
def git_since = 'master' def git_since = 'devel'
def workdir = '/opt/build/go/src/github.com/ceph/ceph-csi' def workdir = '/opt/build/go/src/github.com/ceph/ceph-csi'
def doc_change = 0 def doc_change = 0
// private, internal container image repository // private, internal container image repository

View File

@ -12,7 +12,7 @@ spec:
source: source:
git: git:
uri: https://github.com/ceph/ceph-csi uri: https://github.com/ceph/ceph-csi
ref: master ref: devel
contextDir: . contextDir: .
strategy: strategy:
dockerStrategy: dockerStrategy:
@ -38,7 +38,7 @@ spec:
source: source:
git: git:
uri: https://github.com/ceph/ceph-csi uri: https://github.com/ceph/ceph-csi
ref: master ref: devel
contextDir: . contextDir: .
strategy: strategy:
dockerStrategy: dockerStrategy:
@ -64,7 +64,7 @@ spec:
source: source:
git: git:
uri: https://github.com/ceph/ceph-csi uri: https://github.com/ceph/ceph-csi
ref: master ref: devel
contextDir: . contextDir: .
strategy: strategy:
dockerStrategy: dockerStrategy:

View File

@ -1,7 +1,7 @@
--- ---
- job: - job:
name: build-images name: build-images
description: Build container images from the master branch. description: Build container images from the devel branch.
project-type: pipeline project-type: pipeline
concurrent: false concurrent: false
properties: properties:
@ -13,7 +13,7 @@
# yamllint disable rule:line-length # yamllint disable rule:line-length
dsl: | dsl: |
def GIT_REPO = 'http://github.com/ceph/ceph-csi' def GIT_REPO = 'http://github.com/ceph/ceph-csi'
def GIT_BRANCH = 'master' def GIT_BRANCH = 'devel'
node { node {
stage('checkout repository') { stage('checkout repository') {
git url: "${GIT_REPO}", branch: "${GIT_BRANCH}", changelog: false git url: "${GIT_REPO}", branch: "${GIT_BRANCH}", changelog: false
@ -43,7 +43,7 @@
name: origin name: origin
url: https://github.com/ceph/ceph-csi url: https://github.com/ceph/ceph-csi
branches: branches:
- master - devel
triggers: triggers:
- pollscm: - pollscm:
cron: "H/5 * * * *" cron: "H/5 * * * *"

View File

@ -3,8 +3,8 @@ def cico_retry_interval = 60
def ci_git_repo = 'https://github.com/ceph/ceph-csi' def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos' def ci_git_branch = 'ci/centos'
def git_repo = 'https://github.com/ceph/ceph-csi' def git_repo = 'https://github.com/ceph/ceph-csi'
def ref = "master" def ref = "devel"
def git_since = 'master' def git_since = 'devel'
def skip_e2e = 0 def skip_e2e = 0
def doc_change = 0 def doc_change = 0
def k8s_release = 'latest' def k8s_release = 'latest'

View File

@ -3,8 +3,8 @@ def cico_retry_interval = 60
def ci_git_repo = 'https://github.com/ceph/ceph-csi' def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos' def ci_git_branch = 'ci/centos'
def git_repo = 'https://github.com/ceph/ceph-csi' def git_repo = 'https://github.com/ceph/ceph-csi'
def ref = "master" def ref = "devel"
def git_since = "master" def git_since = "devel"
def skip_e2e = 0 def skip_e2e = 0
def doc_change = 0 def doc_change = 0
def k8s_release = 'latest' def k8s_release = 'latest'

View File

@ -3,8 +3,8 @@ def cico_retry_interval = 60
def ci_git_repo = 'https://github.com/ceph/ceph-csi' def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos' def ci_git_branch = 'ci/centos'
def git_repo = 'https://github.com/ceph/ceph-csi' def git_repo = 'https://github.com/ceph/ceph-csi'
def ref = "master" def ref = "devel"
def git_since = 'master' def git_since = 'devel'
def skip_e2e = 0 def skip_e2e = 0
def doc_change = 0 def doc_change = 0
def k8s_release = 'latest' def k8s_release = 'latest'

View File

@ -5,8 +5,8 @@ set -e -o pipefail
# In case no value is specified, default values will be used. # In case no value is specified, default values will be used.
gitrepo="https://github.com/ceph/ceph-csi" gitrepo="https://github.com/ceph/ceph-csi"
workdir="tip/" workdir="tip/"
ref="master" ref="devel"
base="master" base="devel"
history="no" history="no"
ARGUMENT_LIST=( ARGUMENT_LIST=(

View File

@ -6,7 +6,7 @@
# Usage: scripts/container-needs-rebuild.sh {test|devel} [git-since] # Usage: scripts/container-needs-rebuild.sh {test|devel} [git-since]
# #
# - flavour is either 'test' or 'devel' # - 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 # not set
# #
# Returns 0 in case changes do not affect the container image. # Returns 0 in case changes do not affect the container image.
@ -23,7 +23,7 @@ fi
GIT_SINCE="${2}" GIT_SINCE="${2}"
if [ -z "${GIT_SINCE}" ]; then if [ -z "${GIT_SINCE}" ]; then
GIT_SINCE='origin/master' GIT_SINCE='origin/devel'
fi fi
MODIFIED_FILES=$(git diff --name-only "${GIT_SINCE}") MODIFIED_FILES=$(git diff --name-only "${GIT_SINCE}")

View File

@ -3,7 +3,7 @@
GIT_SINCE="${1}" GIT_SINCE="${1}"
if [ -z "${GIT_SINCE}" ]; then if [ -z "${GIT_SINCE}" ]; then
GIT_SINCE='origin/master' GIT_SINCE='origin/devel'
fi fi
CHANGED_FILES=$(git diff --name-only "${GIT_SINCE}") CHANGED_FILES=$(git diff --name-only "${GIT_SINCE}")

View File

@ -3,8 +3,8 @@ def cico_retry_interval = 60
def ci_git_repo = 'https://github.com/ceph/ceph-csi' def ci_git_repo = 'https://github.com/ceph/ceph-csi'
def ci_git_branch = 'ci/centos' def ci_git_branch = 'ci/centos'
def git_repo = 'https://github.com/ceph/ceph-csi' def git_repo = 'https://github.com/ceph/ceph-csi'
def ref = "master" def ref = "devel"
def git_since = 'master' def git_since = 'devel'
def skip_e2e = 0 def skip_e2e = 0
def doc_change = 0 def doc_change = 0
def k8s_release = 'latest' def k8s_release = 'latest'