From 428154ce451271bc88ce2de02b64dad70534d338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 26 Dec 2020 15:21:15 +0100 Subject: [PATCH] build: update to use origin/main --- Jenkinsfile | 4 ++-- tox.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e71b946..418334d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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" diff --git a/tox.ini b/tox.ini index 3f8f78a..1093e0b 100644 --- a/tox.ini +++ b/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/}