diff --git a/commitlint.groovy b/commitlint.groovy index 5630f4e8a..23061c047 100644 --- a/commitlint.groovy +++ b/commitlint.groovy @@ -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') { diff --git a/containerized-tests.groovy b/containerized-tests.groovy index 2c0234117..364247ca1 100644 --- a/containerized-tests.groovy +++ b/containerized-tests.groovy @@ -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 diff --git a/deploy/ceph-csi-buildconfig.yaml b/deploy/ceph-csi-buildconfig.yaml index 4a2d6fd67..22c0845f3 100644 --- a/deploy/ceph-csi-buildconfig.yaml +++ b/deploy/ceph-csi-buildconfig.yaml @@ -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: diff --git a/jobs/build-images.yaml b/jobs/build-images.yaml index 2340e1a8c..c0d7fae10 100644 --- a/jobs/build-images.yaml +++ b/jobs/build-images.yaml @@ -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 * * * *" diff --git a/k8s-e2e-external-storage.groovy b/k8s-e2e-external-storage.groovy index 46e68b83c..a057ed0e3 100644 --- a/k8s-e2e-external-storage.groovy +++ b/k8s-e2e-external-storage.groovy @@ -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' diff --git a/mini-e2e-helm.groovy b/mini-e2e-helm.groovy index 031685f1c..ae2ce1044 100644 --- a/mini-e2e-helm.groovy +++ b/mini-e2e-helm.groovy @@ -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' diff --git a/mini-e2e.groovy b/mini-e2e.groovy index 48a59ad52..ba55d4516 100644 --- a/mini-e2e.groovy +++ b/mini-e2e.groovy @@ -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' diff --git a/prepare.sh b/prepare.sh index f79d7cab7..b9c599345 100755 --- a/prepare.sh +++ b/prepare.sh @@ -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=( diff --git a/scripts/container-needs-rebuild.sh b/scripts/container-needs-rebuild.sh index 7d350a65f..e26709ad2 100755 --- a/scripts/container-needs-rebuild.sh +++ b/scripts/container-needs-rebuild.sh @@ -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}") diff --git a/scripts/skip-doc-change.sh b/scripts/skip-doc-change.sh index 7644881a0..b84463dc6 100755 --- a/scripts/skip-doc-change.sh +++ b/scripts/skip-doc-change.sh @@ -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}") diff --git a/upgrade-tests.groovy b/upgrade-tests.groovy index 414bcd92b..ad6fe4780 100644 --- a/upgrade-tests.groovy +++ b/upgrade-tests.groovy @@ -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'