build: update to use origin/main
This commit is contained in:
parent
a7d59cb99f
commit
3e5838c9ac
|
@ -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 == 'passerelle-montpellier-encombrants' && env.GIT_BRANCH == 'origin/master') {
|
||||
if (env.JOB_NAME == 'passerelle-montpellier-encombrants' && env.GIT_BRANCH == 'origin/main') {
|
||||
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder passerelle-montpellier-encombrants'
|
||||
} else if (env.GIT_BRANCH.startsWith('hotfix/')) {
|
||||
sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix passerelle-montpellier-encombrants"
|
||||
|
|
2
tox.ini
2
tox.ini
|
@ -14,7 +14,7 @@ setenv =
|
|||
coverage: COVERAGE=--cov-report xml --cov-report html --cov=passerelle_montpellier_encombrants/
|
||||
junit: JUNIT=--junitxml=junit-{envname}.xml
|
||||
deps =
|
||||
https://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz
|
||||
https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz
|
||||
psycopg2-binary
|
||||
xmlschema<1.1
|
||||
psycopg2
|
||||
|
|
Loading…
Reference in New Issue