sts-sponsors team mailing list archive

[Adam Collard <mp+438285@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas-ci/+git/maas-ci-config:describe-systemtests into ~maas-committers/maas-ci/+git/maas-ci-config:master.

Commit message:
[system-tests*] describe build using output from pytest header



Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~adam-collard/maas-ci/+git/maas-ci-config/+merge/438285
-- 
Your team MAAS Committers is requested to review the proposed merge of ~adam-collard/maas-ci/+git/maas-ci-config:describe-systemtests into ~maas-committers/maas-ci/+git/maas-ci-config:master.

diff --git a/jenkins/jobs/systemtests.yaml b/jenkins/jobs/systemtests.yaml
index 280f93c..3bb459a 100644
--- a/jenkins/jobs/systemtests.yaml
+++ b/jenkins/jobs/systemtests.yaml
@@ -260,13 +260,23 @@
                   export https_proxy=http://squid.internal:3128/
                   export TOX_PARALLEL_NO_SPINNER=1
                   tox -e cog
-                  tox -e env_builder,general_tests -- ${params.PYTEST_ARGS}
+                  tox -e env_builder --${params.PYTEST_ARGS} | tee env_builder.out
+                  tox -e general_tests -- 
                   tox -p all -e vm1,natasha -- ${params.PYTEST_ARGS}
                   tox -p all -e opelt,arm64,ppc64le,vm2 -- ${params.PYTEST_ARGS}
                 """
               }
             }
           }
+          stage('Describe') {
+            steps {
+              script {
+                info = sh (returnStdout: true, script: "awk '/BEGIN_SYSTEMTESTS_META/{ f = 1; next } /END_SYSTEMTESTS_META/ { f = 0 } f' system-tests/env_builder.out")
+                currentBuild.description = "$info"
+              }
+            }
+          }
+
         }
         post {
           always {
diff --git a/jenkins/jobs/systemtests_executor.groovy b/jenkins/jobs/systemtests_executor.groovy
index 28f4d0e..8a3e179 100644
--- a/jenkins/jobs/systemtests_executor.groovy
+++ b/jenkins/jobs/systemtests_executor.groovy
@@ -47,34 +47,35 @@ pipeline {
                 }
             }
         }
-	stage('Cog') {
-	    steps {
-		script {
-		    sh 'env -C system-tests tox run -e cog'
-		}
-	    }
-	}
-	stage('Filter envs') {
-	    steps {
-		script {
-		    sh 'env -C system-tests tox run -e filter_envs -- --output-file=envs1 vm1,natasha'
-		    sh 'env -C system-tests tox run -e filter_envs -- --output-file=envs2 opelt,arm64,ppc64le,vm2'
-		}
-	    }
-	}
+        stage('Cog') {
+            steps {
+                script {
+                    sh 'env -C system-tests tox run -e cog'
+                }
+            }
+        }
+        stage('Filter envs') {
+            steps {
+                script {
+                    sh 'env -C system-tests tox run -e filter_envs -- --output-file=envs1 vm1,natasha'
+                    sh 'env -C system-tests tox run -e filter_envs -- --output-file=envs2 opelt,arm64,ppc64le,vm2'
+                }
+            }
+        }
         stage('System Tests') {
             steps {
                 script {
                     sh """
                     cd system-tests
                     cat config.yaml
-                    tox run -e env_builder,general_tests -- ${params.PYTEST_ARGS}
+                    tox run -e env_builder -- ${params.PYTEST_ARGS} | tee env_builder.out
+                    tox run -e general_tests -- ${params.PYTEST_ARGS}
                     """
-		    status1 = sh(script:"""
+                    status1 = sh(script:"""
                     cd system-tests
                     if test -s envs1; then tox run-parallel -e \$(cat envs1) -- ${params.PYTEST_ARGS}; else true; fi
                     """, returnStatus: true)
-		    status2 = sh(script:"""
+                    status2 = sh(script:"""
                     cd system-tests
                     if test -s envs2; then tox run-parallel -e \$(cat envs2) -- ${params.PYTEST_ARGS}; else true; fi
                     """, returnStatus: true)
@@ -84,6 +85,15 @@ pipeline {
                 }
             }
         }
+        stage('Describe') {
+            steps {
+                script {
+                    info = sh (returnStdout: true, script: "awk '/BEGIN_SYSTEMTESTS_META/{ f = 1; next } /END_SYSTEMTESTS_META/ { f = 0 } f' system-tests/env_builder.out")
+                    currentBuild.description = "$info"
+                }
+            }
+        }
+
     }
     post {
         always {
diff --git a/jenkins/jobs/systemtests_snap.yaml b/jenkins/jobs/systemtests_snap.yaml
index 6c9163a..51ed33d 100644
--- a/jenkins/jobs/systemtests_snap.yaml
+++ b/jenkins/jobs/systemtests_snap.yaml
@@ -259,13 +259,23 @@
                   export https_proxy=http://squid.internal:3128/
                   export TOX_PARALLEL_NO_SPINNER=1
                   tox -e cog
-                  tox -e env_builder,general_tests -- ${params.PYTEST_ARGS}
+                  tox -e env_builder -- ${params.PYTEST_ARGS} | tee env_builder.out
+                  tox -e general_tests -- ${params.PYTEST_ARGS}
                   tox -p all -e vm1,natasha -- ${params.PYTEST_ARGS}
                   tox -p all -e opelt,arm64,ppc64le,vm2 -- ${params.PYTEST_ARGS}
                 """
               }
             }
           }
+          stage('Describe') {
+            steps {
+              script {
+                info = sh (returnStdout: true, script: "awk '/BEGIN_SYSTEMTESTS_META/{ f = 1; next } /END_SYSTEMTESTS_META/ { f = 0 } f' system-tests/env_builder.out")
+                currentBuild.description = "$info"
+              }
+            }
+          }
+
         }
         post {
           always {