build: update to use origin/main
This commit is contained in:
parent
17ee1bf6d5
commit
402e187edf
|
@ -1,4 +1,4 @@
|
|||
@Library('eo-jenkins-lib@master') import eo.Utils
|
||||
@Library('eo-jenkins-lib@main') import eo.Utils
|
||||
|
||||
pipeline {
|
||||
agent any
|
||||
|
@ -32,7 +32,7 @@ pipeline {
|
|||
stage('Packaging') {
|
||||
steps {
|
||||
script {
|
||||
if (env.JOB_NAME == 'hobo' && env.GIT_BRANCH == 'origin/master') {
|
||||
if (env.JOB_NAME == 'hobo' && env.GIT_BRANCH == 'origin/main') {
|
||||
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder hobo'
|
||||
} else if (env.GIT_BRANCH.startsWith('hotfix/')) {
|
||||
sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix hobo"
|
||||
|
|
6
tox.ini
6
tox.ini
|
@ -41,15 +41,15 @@ deps:
|
|||
django-webtest
|
||||
Markdown<3
|
||||
django-tables2<2.0
|
||||
authentic: https://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.gz
|
||||
authentic: https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz
|
||||
py2-authentic: django-filter<2
|
||||
py3-authentic: django-filter<2.3
|
||||
passerelle: https://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz
|
||||
passerelle: https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz
|
||||
py2-passerelle: suds
|
||||
py2-passerelle: pyrsistent<0.17
|
||||
passerelle: python-memcached
|
||||
multitenant: systemd-python
|
||||
https://git.entrouvert.org/debian/django-tenant-schemas.git/snapshot/django-tenant-schemas-master.tar.gz
|
||||
https://git.entrouvert.org/debian/django-tenant-schemas.git/snapshot/django-tenant-schemas-main.tar.gz
|
||||
mock<4
|
||||
httmock
|
||||
requests
|
||||
|
|
Loading…
Reference in New Issue