entrouvert
/
bijoe
17
0
Fork 0
Code Issues Pull Requests Releases Activity

build: update to use origin/main

This commit is contained in:
Frédéric Péters 2020-12-26 15:21:15 +01:00
parent 84951b6eeb
commit 428154ce45
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -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
@ -21,7 +21,7 @@ pipeline {
stage('Packaging') { stage('Packaging') {
steps { steps {
script { 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' sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder bijoe'
} 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 bijoe" sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix bijoe"

2
tox.ini
View File

@ -28,7 +28,7 @@ deps =
pyquery pyquery
tabulate tabulate
dj22: djangorestframework>=3.7 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 = commands =
py3-dj111: py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=bijoe tests/} 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/} 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/}