build: update to use origin/main
This commit is contained in:
parent
84951b6eeb
commit
428154ce45
|
@ -1,4 +1,4 @@
|
|||
@Library('eo-jenkins-lib@master') import eo.Utils
|
||||
@Library('eo-jenkins-lib@main') import eo.Utils
|
||||
|
||||
pipeline {
|
||||
agent any
|
||||
|
@ -21,7 +21,7 @@ pipeline {
|
|||
stage('Packaging') {
|
||||
steps {
|
||||
script {
|
||||
if (env.JOB_NAME == 'bijoe' && env.GIT_BRANCH == 'origin/master') {
|
||||
if (env.JOB_NAME == 'bijoe' && env.GIT_BRANCH == 'origin/main') {
|
||||
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder bijoe'
|
||||
} else if (env.GIT_BRANCH.startsWith('hotfix/')) {
|
||||
sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix bijoe"
|
||||
|
|
2
tox.ini
2
tox.ini
|
@ -28,7 +28,7 @@ deps =
|
|||
pyquery
|
||||
tabulate
|
||||
dj22: djangorestframework>=3.7
|
||||
dj111: https://git.entrouvert.org/hobo.git/snapshot/hobo-master.tar.gz
|
||||
dj111: https://git.entrouvert.org/hobo.git/snapshot/hobo-main.tar.gz
|
||||
commands =
|
||||
py3-dj111: py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=bijoe tests/}
|
||||
py3-dj22: py.test {posargs: --ignore=tests/test_hobo_deploy.py --ignore=tests/test_hobo_agent.py --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=bijoe tests/}
|
||||
|
|
Loading…
Reference in New Issue