build: update to use origin/main
This commit is contained in:
parent
65f1c28ea1
commit
efddaf617a
|
@ -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
|
||||||
|
@ -38,7 +38,7 @@ PGPORT=`python -c 'import struct; import socket; s=socket.socket(); s.setsockopt
|
||||||
stage('Packaging') {
|
stage('Packaging') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
if (env.JOB_NAME == 'authentic2-auth-kerberos' && (!env.GIT_BRANCH || env.GIT_BRANCH != 'origin/master')) {
|
if (env.JOB_NAME == 'authentic2-auth-kerberos' && (!env.GIT_BRANCH || env.GIT_BRANCH != 'origin/main')) {
|
||||||
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder authentic2-auth-kerberos'
|
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder authentic2-auth-kerberos'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -32,7 +32,7 @@ passenv=
|
||||||
PGPASSWORD
|
PGPASSWORD
|
||||||
usedevelop = true
|
usedevelop = true
|
||||||
deps =
|
deps =
|
||||||
https://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.gz
|
https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz
|
||||||
# dependency constraints for authentic
|
# dependency constraints for authentic
|
||||||
py2: django-appconf<1.0.4
|
py2: django-appconf<1.0.4
|
||||||
py2: django-filter<2
|
py2: django-filter<2
|
||||||
|
@ -63,7 +63,7 @@ commands =
|
||||||
usedevelop = true
|
usedevelop = true
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
deps =
|
deps =
|
||||||
https://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.gz
|
https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz
|
||||||
Django<2.3
|
Django<2.3
|
||||||
pylint<1.8
|
pylint<1.8
|
||||||
pylint-django<0.8.1
|
pylint-django<0.8.1
|
||||||
|
|
Loading…
Reference in New Issue