Move to JePL 2

.sqa/config.yml

@@ -0,0 +1,20 @@
+sqa_criteria:
+  qc_style:
+    repos:
+      deepaas:
+        container: DEEPaaS-testing
+        tox:
+          tox_file: 'tox.ini'
+          testenv: 
+            - flake8
+            - black
+            - pip-missing-reqs
+            - pypi
+  qc_security:
+    repos:
+      deepaas:
+        container: DEEPaaS-testing
+        tox:
+          tox_file: 'tox.ini'
+          testenv:
+            - bandit

.sqa/docker-compose.yml

@@ -0,0 +1,11 @@
+version: "3.6"
+
+services:
+  DEEPaaS-testing:
+    image: "indigodatacloud/ci-images:python3.11"
+    hostname: "deepaas-testing"
+    volumes:
+     - type: bind
+       source: ./
+       target: /deepaas-testing
+    working_dir: /deepaas-testing

Jenkinsfile

@@ -1,94 +1,27 @@
 #!/usr/bin/groovy
 
-@Library(['github.com/indigo-dc/jenkins-pipeline-library@1.4.0']) _
+@Library(['github.com/indigo-dc/jenkins-pipeline-library@release/2.1.0']) _
+
+def projectConfig
 
 pipeline {
     agent {
-        docker { image 'indigodatacloud/ci-images:python3.10' }
-    }
-
-    environment {
-        dockerhub_repo = "indigodatacloud/deepaas"
-        dockerhub_image_id = ""
+        label 'docker'
     }
 
     stages {
-        stage('Code fetching') {
-            steps {
-                checkout scm
-            }
-        }
-
-        stage('Style analysis') {
+        stage('SQA baseline dynamic stages') {
             steps {
-                ToxEnvRun('flake8')
+                script {
+                    projectConfig = pipelineConfig()
+                    buildStages(projectConfig)
+                }
             }
             post {
-                always {
-                    recordIssues(tools: [flake8()])
+                cleanup {
+                    cleanWs()
                 }
             }
         }
-
-        stage('Unit testing coverage') {
-            steps {
-                ToxEnvRun('cover')
-                ToxEnvRun('cobertura')
-            }
-            // post {
-            //     success {
-            //         HTMLReport('cover', 'index.html', 'coverage.py report')
-            //         CoberturaReport('**/coverage.xml')
-            //     }
-            // }
-        }
-
-        stage('Dependency check') {
-            steps {
-                ToxEnvRun('pip-missing-reqs')
-            }
-        }
-
-        // stage('DockerHub delivery') {
-        //     when {
-        //         anyOf {
-        //             branch 'master'
-        //             buildingTag()
-        //         }
-        //     }
-        //     agent {
-        //         label 'docker-build'
-        //     }
-        //     steps {
-        //         checkout scm
-        //         script {
-        //             dockerhub_image_id = DockerBuild(dockerhub_repo,
-        //                                              tag: env.BRANCH_NAME)
-        //         }
-        //     }
-        //     post {
-        //         success {
-        //             DockerPush(dockerhub_image_id)
-        //         }
-        //         failure {
-        //             DockerClean()
-        //         }
-        //         always {
-        //             cleanWs()
-        //         }
-        //     }
-        // }
-
-        // stage('PyPI delivery') {
-        //     when {
-        //         anyOf {
-        //             buildingTag()
-        //         }
-        //     }
-        //     steps {
-        //         PyPIDeploy('deepaas', 'indigobot-pypi')
-        //     }
-        // }
-
     }
 }

tox.ini

@@ -19,12 +19,7 @@ python =
     3.12: py312
 
 [base]
-python = python3.11
-skip_install = true
-package = deepaas
-
-[jenkins]
-python = python3.10
+python = python3.12
 skip_install = true
 package = deepaas
 
@@ -88,8 +83,8 @@ exclude =
     build
 
 [testenv:flake8]
-basepython = {[jenkins]python}
-skip_install = {[jenkins]skip_install}
+basepython = {[base]python}
+skip_install = {[base]skip_install}
 deps =
     flake8>=4.0,<4.1
     flake8-bugbear>=22.3,<22.4
@@ -149,6 +144,6 @@ commands =
     mypy --config-file mypy.ini -p {[base]package}
 
 [testenv:pip-missing-reqs]
-basepython = {[jenkins]python}
+basepython = {[base]python}
 deps = pip_check_reqs
-commands=pip-missing-reqs -d --ignore-file={[jenkins]package}/tests/* {[jenkins]package}
+commands=pip-missing-reqs -d --ignore-file={[base]package}/tests/* {[base]package}