Projet

Général

Profil

0001-jenkins-do-not-run-tests-against-django-1.11-anymore.patch

Frédéric Péters, 01 juillet 2021 22:47

Télécharger (2,94 ko)

Voir les différences: 

Subject: [PATCH] jenkins: do not run tests against django 1.11 anymore
 (#55333)


 Jenkinsfile | 39 ++++++++-------------------------------
 tox.ini     |  3 +--
 2 files changed, 9 insertions(+), 33 deletions(-)
Jenkinsfile
5 5 
    options { disableConcurrentBuilds() }
6 6 
    stages {
7 7 
        stage('Unit Tests') {
8 
            parallel {
9 
                stage('Unit tests django 1.11') {
10 
                    agent any
11 
                    steps {
12 
                        sh 'tox -rv -e py3-django111-codestyle-pylint-coverage'
13 
                    }
14 
                    post {
15 
                        always {
16 
                            stash includes:'junit-py3-django111-codestyle-pylint-coverage.xml', name: 'django111'
17 
                            script {
18 
                                utils = new Utils()
19 
                                utils.publish_coverage('coverage.xml')
20 
                                utils.publish_coverage_native('index.html')
21 
                                utils.publish_pylint('pylint.out')
22 
                            }
23 
                        }
24 
                    }
25 
                }
26 
                stage('Unit tests django 2.2') {
27 
                    agent any
28 
                    steps {
29 
                        sh 'tox -rv -e py3-django22'
30 
                    }
31 
                    post {
32 
                        always {
33 
                            stash includes:'junit-py3-django22.xml', name: 'django22'
34 
                        }
35 
                    }
36 
                }
8 
            steps {
9 
                sh 'tox -rv'
37 10 
            }
38 11 
            post {
39 12 
                always {
40 
                    unstash 'django111'
41 
                    unstash 'django22'
13 
                    script {
14 
                        utils = new Utils()
15 
                        utils.publish_coverage('coverage.xml')
16 
                        utils.publish_coverage_native('index.html')
17 
                        utils.publish_pylint('pylint.out')
18 
                    }
42 19 
                    mergeJunitResults()
43 20 
                }
44 21 
            }
tox.ini
1 1 
[tox]
2 2 
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/wcs/{env:BRANCH_NAME:main}/{env:EXECUTOR_NUMBER:}
3 
envlist = py3-django111-codestyle-pylint-coverage, py3-django22
3 
envlist = py3-django22-codestyle-pylint-coverage
4 4 

  		




  5
  5
  
    
[testenv]

  		




  6
  6
  
    
sitepackages = true

  		




  ......




  36
  36
  
    
    docutils

  		




  37
  37
  
    
    langdetect

  		




  38
  38
  
    
    git+https://git.entrouvert.org/debian/django-ckeditor.git

  		




  39
  
  
    
    django111: django>=1.11,<1.12

  		




  40
  39
  
    
    django22: django>=2.2,<2.3

  		




  41
  40
  
    
    django-ratelimit<3

  		




  42
  41
  
    
    pyproj

  		




  43
  
  
    
-