build: update to use origin/main
This commit is contained in:
parent
a6b22e6b40
commit
a76678bfcf
|
@ -17,7 +17,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@Library('eo-jenkins-lib@master') import eo.Utils
|
@Library('eo-jenkins-lib@main') import eo.Utils
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent any
|
agent any
|
||||||
|
@ -41,7 +41,7 @@ pipeline {
|
||||||
stage('Packaging') {
|
stage('Packaging') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
if (env.JOB_NAME == 'passerelle-atreal-openads' && env.GIT_BRANCH == 'origin/master') {
|
if (env.JOB_NAME == 'passerelle-atreal-openads' && env.GIT_BRANCH == 'origin/main') {
|
||||||
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder passerelle-atreal-openads'
|
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder passerelle-atreal-openads'
|
||||||
} 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 passerelle-atreal-openads"
|
sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix passerelle-atreal-openads"
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -30,7 +30,7 @@ setenv =
|
||||||
coverage: COVERAGE=--cov-report xml --cov-report html --cov=atreal_openads/
|
coverage: COVERAGE=--cov-report xml --cov-report html --cov=atreal_openads/
|
||||||
junit: JUNIT=--junitxml=junit-{envname}.xml
|
junit: JUNIT=--junitxml=junit-{envname}.xml
|
||||||
deps =
|
deps =
|
||||||
https://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz
|
https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz
|
||||||
pytest-cov
|
pytest-cov
|
||||||
pytest-django
|
pytest-django
|
||||||
pytest>=3.3.0
|
pytest>=3.3.0
|
||||||
|
@ -51,6 +51,6 @@ usedevelop = True
|
||||||
setenv =
|
setenv =
|
||||||
DJANGO_SETTINGS_MODULE=passerelle.settings
|
DJANGO_SETTINGS_MODULE=passerelle.settings
|
||||||
deps =
|
deps =
|
||||||
https://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz
|
https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz
|
||||||
commands =
|
commands =
|
||||||
python3 ./manage.py {posargs:--help}
|
python3 ./manage.py {posargs:--help}
|
||||||
|
|
Reference in New Issue