Merge branch 'test'

Jenkinsfile

@@ -32,8 +32,20 @@ pipeline {
                 dingNotify "before"
             }
         }
+        stage('Check Code') {
+            //when { branch 'test' }
+            steps {
+                script {
+                    currentBuild.displayName = "Check-Code"
+                    checkCode "3.6"
+                }
+            }
+        }
         stage('Build') {
             steps {
+                script {
+                    currentBuild.displayName = "Build-Image"
+                }
                 sh "docker build . ${params.cache} -f ./Dockerfile -t $IMAGE"
                 sh "docker push $IMAGE"
             }
@@ -43,7 +55,16 @@ pipeline {
 
     post {
         always {
-            dingNotify "after", "${currentBuild.currentResult}"
+            script {
+                def stage = "${currentBuild.displayName}"
+                if (stage == "Check-Code" && fileExists("./flake.output.txt")) {
+                    def description = readFile("./flake.output.txt")
+                    dingNotify "after", "${currentBuild.currentResult}", "${description}"
+                } else {
+                    dingNotify "after", "${currentBuild.currentResult}"
+                }
+            }
+            recordIssues enabledForFailure: true, tools: [flake8()]
         }
     }
 }
\ No newline at end of file

requirements.txt

@@ -22,7 +22,7 @@ kombu==4.0.2
 meld3==1.0.2
 requests==2.2.1
 ssh-import-id==3.21
-urllib3==1.7.1
+urllib3==1.21.1
 vine==1.1.3
 virtualenv==15.1.0
 wheel==0.24.0
@@ -31,7 +31,7 @@ redis==2.10.5
 gunicorn==19.7.1
 gevent==1.2.1
 pygments==2.2.0
-elasticsearch==7.1.0
+elasticsearch==6.3.1
 django-autocomplete-light==3.2.2
 pyssdb==0.4.1
 protobuf==3.6.0