canonical-hw-cert team mailing list archive

[Sylvain Pineau <mp+437875@xxxxxxxxxxxxxxxxxx>]

Sylvain Pineau has proposed merging ~sylvain-pineau/hwcert-jenkins-jobs:pts-cleanup into hwcert-jenkins-jobs:master.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~sylvain-pineau/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/437875

More PTS cleanup
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~sylvain-pineau/hwcert-jenkins-jobs:pts-cleanup into hwcert-jenkins-jobs:master.

diff --git a/jobs/sru/checkbox.conf b/jobs/sru/checkbox.conf
index 026e5b9..7827d24 100644
--- a/jobs/sru/checkbox.conf
+++ b/jobs/sru/checkbox.conf
@@ -19,5 +19,4 @@
         SUDO_USER = ubuntu
         STRESS_NG_DISK_TIME = 15
         STRESS_NG_CPU_TIME = 60
-        PTS_CACHE_URL = http://10.102.196.9/sru/phoronix_cache/
         SNAPD_TASK_TIMEOUT = 120
diff --git a/jobs/sru/run-sru.sh b/jobs/sru/run-sru.sh
index 6d4dfef..1837adb 100644
--- a/jobs/sru/run-sru.sh
+++ b/jobs/sru/run-sru.sh
@@ -99,7 +99,7 @@ cat > job.yaml <<EOF
 
         [test selection]
         forced = yes
-        exclude = .*disk/disk_stress_ng_.* .*stress/cpu_stress_ng_test .*pts/fs-mark .*pts/ramspeed .*s3_pm-graph_30 .*s2idle_pm-graph_30 .*pts/cpuminer-opt com.canonical.certification::clevis-encrypt-tpm2* com.canonical.certification::stress/poweroff* com.canonical.certification::stress/reboot* .*miscellanea/ubuntu-desktop-recommends .*bluetooth_obex_send {exclude_test}
+        exclude = .*disk/disk_stress_ng_.* .*stress/cpu_stress_ng_test .*s3_pm-graph_30 .*s2idle_pm-graph_30 com.canonical.certification::clevis-encrypt-tpm2* com.canonical.certification::stress/poweroff* com.canonical.certification::stress/reboot* .*miscellanea/ubuntu-desktop-recommends .*bluetooth_obex_send {exclude_test}
         EOF
         cat <<EOF > checkbox-launcher-smoke
         #!/usr/bin/env checkbox-cli
@@ -179,14 +179,6 @@ cat > job.yaml <<EOF
             else
               _run sudo DEBIAN_FRONTEND={debian_frontend} apt-get -qq install -o Dpkg::Options::="--force-confdef" -y --force-yes checkbox-ng python3-checkbox-ng checkbox-provider-base checkbox-provider-resource checkbox-provider-sru fswebcam obexftp wmctrl iperf mesa-utils vim pastebinit fwts xorg-dev gir1.2-clutter-1.0
             fi
-
-            # Phoronix Test Suite provider is only available for some releases
-            if [[ {arch} = amd64 ]] && [[ {series} =~ ^(xenial|bionic)$ ]]; then
-                _run sudo apt-get install -y checkbox-provider-phoronix libssl1.1
-                echo "Preparing the PTS cache"
-                _run mkdir /var/tmp/pts-cache
-                _run "wget -qO- {cert-file-tel}/sru/phoronix_cache/x64/{series}/pts-cache.tar.gz |tar xz -C /var/tmp/pts-cache"
-            fi
         else
             # Remove checkbox snap before testing.
             _run sudo snap remove {checkbox_snap_name}
diff --git a/jobs/upgrade-testing/checkbox-upgrade-testing-launcher b/jobs/upgrade-testing/checkbox-upgrade-testing-launcher
index 27764f5..313c461 100644
--- a/jobs/upgrade-testing/checkbox-upgrade-testing-launcher
+++ b/jobs/upgrade-testing/checkbox-upgrade-testing-launcher
@@ -12,8 +12,6 @@
         
         [test selection]
         forced = yes
-        exclude = com.canonical.certification::pts/fs-mark
-                  com.canonical.certification::pts/ramspeed
         
         [ui]
         type = silent
diff --git a/jobs/upgrade-testing/checkbox.conf b/jobs/upgrade-testing/checkbox.conf
index ff99e8f..5d47bce 100644
--- a/jobs/upgrade-testing/checkbox.conf
+++ b/jobs/upgrade-testing/checkbox.conf
@@ -17,4 +17,3 @@
         TRANSFER_SERVER = cdimage.ubuntu.com
         STRESS_NG_DISK_TIME = 15
         STRESS_NG_CPU_TIME = 60
-        PTS_CACHE_URL = http://10.102.196.9/sru/phoronix_cache/