Merge branch 'master' of ssh://repos.entrouvert.org/passerelle-grandlyon-iodas

Jenkinsfile

@@ -0,0 +1,29 @@
+@Library('eo-jenkins-lib@master') import eo.Utils
+
+pipeline {
+    agent any
+    stages {
+        stage('Packaging') {
+            steps {
+                script {
+                    if (env.JOB_NAME == 'passerelle-grandlyon-iodas' && env.GIT_BRANCH == 'origin/master') {
+                        sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder -d stretch passerelle-grandlyon-iodas'
+                    } else if (env.GIT_BRANCH.startsWith('hotfix/')) {
+                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder -d stretch --branch ${env.GIT_BRANCH} --hotfix passerelle-grandlyon-iodas"
+                    }
+                }
+            }
+        }
+    }
+    post {
+        always {
+            script {
+                utils = new Utils()
+                utils.mail_notify(currentBuild, env, 'ci+jenkins-passerelle-grandlyon-iodas@entrouvert.org')
+            }
+        }
+        success {
+            cleanWs()
+        }
+    }
+}

grandlyon_iodas/migrations/0002_auto_20181119_1453.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.12 on 2018-11-19 13:53
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grandlyon_iodas', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='grandlyoniodas',
+            options={'verbose_name': 'Connecteur IODAS Grand Lyon'},
+        ),
+        migrations.RemoveField(
+            model_name='grandlyoniodas',
+            name='log_level',
+        ),
+    ]