build: update to use origin/main
This commit is contained in:
parent
a68c101e3b
commit
ebb4090212
|
@ -1,4 +1,4 @@
|
||||||
@Library('eo-jenkins-lib@master') import eo.Utils
|
@Library('eo-jenkins-lib@main') import eo.Utils
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent any
|
agent any
|
||||||
|
@ -21,7 +21,7 @@ pipeline {
|
||||||
stage('Packaging') {
|
stage('Packaging') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
if (env.JOB_NAME == 'corbo' && env.GIT_BRANCH == 'origin/master') {
|
if (env.JOB_NAME == 'corbo' && env.GIT_BRANCH == 'origin/main') {
|
||||||
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder corbo'
|
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder corbo'
|
||||||
} else if (env.GIT_BRANCH.startsWith('hotfix/')) {
|
} else if (env.GIT_BRANCH.startsWith('hotfix/')) {
|
||||||
sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix corbo"
|
sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix corbo"
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -14,7 +14,7 @@ setenv =
|
||||||
deps =
|
deps =
|
||||||
django111: django>=1.11,<1.12
|
django111: django>=1.11,<1.12
|
||||||
django22: django>=2.2,<2.3
|
django22: django>=2.2,<2.3
|
||||||
django111: https://git.entrouvert.org/hobo.git/snapshot/hobo-master.tar.gz
|
django111: https://git.entrouvert.org/hobo.git/snapshot/hobo-main.tar.gz
|
||||||
pytest-cov
|
pytest-cov
|
||||||
pytest-django
|
pytest-django
|
||||||
pytest
|
pytest
|
||||||
|
|
Reference in New Issue