Workaround for CI test

opprop · Jan 27, 2024 · c8a7a11 · c8a7a11
1 parent 6a26cfa
commit c8a7a11
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 163 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -12,7 +12,7 @@ jobs:
 
 # The dependsOn clauses are:
 #  * Everything depends on the canary jobs (the 4 main jdk17 jobs), except those jobs themselves.
-#  * Anything *_jdk8, *_jdk11, or *_jdk19 depends on *_jdk17.
+#  * Anything *_jdk8 or *_jdk11 depends on *_jdk17.
 #  * Anything daikon_* and guava_* depends on the framework jobs (all core CF tests for JDK 8, 11, and 17).
 #    (This avoids running these long-running jobs if something already failed in the framework.)
 
@@ -35,19 +35,15 @@ jobs:
    - junit_tests_jdk8
    - junit_tests_jdk11
    - junit_tests_jdk17
-   # - junit_tests_jdk19
    - nonjunit_tests_jdk8
    - nonjunit_tests_jdk11
    - nonjunit_tests_jdk17
-   # - nonjunit_tests_jdk19
    - inference_tests_jdk8
    - inference_tests_jdk11
    - inference_tests_jdk17
-   # - inference_tests_jdk19
    - typecheck_jdk8
    - typecheck_jdk11
    - typecheck_jdk17
-   # - typecheck_jdk19
   pool:
     vmImage: 'ubuntu-latest'
   steps:
@@ -61,7 +57,7 @@ jobs:
    - junit_tests_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk8:latest
+  container: wmdietl/cf-ubuntu-jdk8:latest
   timeoutInMinutes: 70
   steps:
   - checkout: self
@@ -79,7 +75,7 @@ jobs:
    - junit_tests_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk11:latest
+  container: wmdietl/cf-ubuntu-jdk11:latest
   steps:
   - checkout: self
     fetchDepth: 25
@@ -93,19 +89,7 @@ jobs:
 - job: junit_tests_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: wmdietl/cf-ubuntu-jdk-latest:latest
-  timeoutInMinutes: 70
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: ./checker/bin-devel/test-cftests-junit.sh
-    displayName: test-cftests-junit.sh
-- job: junit_tests_jdk19
-  dependsOn:
-   - canary_jobs
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk19:latest
+  container: wmdietl/cf-ubuntu-jdk17:latest
   timeoutInMinutes: 70
   steps:
   - checkout: self
@@ -119,7 +103,7 @@ jobs:
    - nonjunit_tests_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk8:latest
+  container: wmdietl/cf-ubuntu-jdk8:latest
   steps:
   - checkout: self
     fetchDepth: 25
@@ -131,7 +115,7 @@ jobs:
    - nonjunit_tests_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk11:latest
+  container: wmdietl/cf-ubuntu-jdk11:latest
   steps:
   - checkout: self
     fetchDepth: 25
@@ -140,18 +124,7 @@ jobs:
 - job: nonjunit_tests_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: wmdietl/cf-ubuntu-jdk-latest:latest
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: ./checker/bin-devel/test-cftests-nonjunit.sh
-    displayName: test-cftests-nonjunit.sh
-- job: nonjunit_tests_jdk19
-  dependsOn:
-   - canary_jobs
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk19:latest
+  container: wmdietl/cf-ubuntu-jdk17:latest
   steps:
   - checkout: self
     fetchDepth: 25
@@ -185,20 +158,7 @@ jobs:
 - job: inference_tests_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk17:latest
-  timeoutInMinutes: 70
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: ./checker/bin-devel/test-cftests-inference.sh
-    displayName: test-cftests-inference.sh
-- job: inference_tests_jdk19
-  dependsOn:
-   - canary_jobs
-   - inference_tests_jdk17
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk19:latest
+  container: wmdietl/cf-ubuntu-jdk17:latest
   timeoutInMinutes: 70
   steps:
   - checkout: self
@@ -213,7 +173,7 @@ jobs:
    - misc_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk8-plus:latest
+  container: wmdietl/cf-ubuntu-jdk8-plus:latest
   steps:
   - checkout: self
   - bash: ./checker/bin-devel/test-misc.sh
@@ -224,26 +184,15 @@ jobs:
    - misc_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk11-plus:latest
+  container: wmdietl/cf-ubuntu-jdk11-plus:latest
   steps:
   - checkout: self
   - bash: ./checker/bin-devel/test-misc.sh
     displayName: test-misc.sh
 - job: misc_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: wmdietl/cf-ubuntu-jdk-latest-plus:latest
-  steps:
-  - checkout: self
-  - bash: ./checker/bin-devel/test-misc.sh
-    displayName: test-misc.sh
-- job: misc_jdk19
-  dependsOn:
-   # - canary_jobs
-   - misc_jdk17
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk19-plus:latest
+  container: wmdietl/cf-ubuntu-jdk17-plus:latest
   steps:
   - checkout: self
   - bash: ./checker/bin-devel/test-misc.sh
@@ -255,7 +204,7 @@ jobs:
    - typecheck_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk8-plus:latest
+  container: wmdietl/cf-ubuntu-jdk8:latest
   steps:
   - checkout: self
     fetchDepth: 1000
@@ -267,7 +216,7 @@ jobs:
    - typecheck_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk11-plus:latest
+  container: wmdietl/cf-ubuntu-jdk11:latest
   steps:
   - checkout: self
     fetchDepth: 1000
@@ -276,18 +225,7 @@ jobs:
 - job: typecheck_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: wmdietl/cf-ubuntu-jdk-latest-plus:latest
-  steps:
-  - checkout: self
-    fetchDepth: 1000
-  - bash: ./checker/bin-devel/test-typecheck.sh
-    displayName: test-typecheck.sh
-- job: typecheck_jdk19
-  dependsOn:
-   - canary_jobs
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk19-plus:latest
+  container: wmdietl/cf-ubuntu-jdk17-plus:latest
   steps:
   - checkout: self
     fetchDepth: 1000
@@ -300,7 +238,7 @@ jobs:
    - daikon_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk8:latest
+  container: wmdietl/cf-ubuntu-jdk8:latest
   timeoutInMinutes: 70
   steps:
   - checkout: self
@@ -313,7 +251,7 @@ jobs:
    - daikon_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk11:latest
+  container: wmdietl/cf-ubuntu-jdk11:latest
   timeoutInMinutes: 80
   steps:
   - checkout: self
@@ -325,21 +263,7 @@ jobs:
    - framework_jobs
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk17:latest
-  timeoutInMinutes: 70
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: ./checker/bin-devel/test-daikon.sh
-    displayName: test-daikon.sh
-- job: daikon_jdk19
-  dependsOn:
-   - framework_jobs
-   # Could comment out the "daikon_jdk17" dependency to reduce latency.
-   - daikon_jdk17
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk19:latest
+  container: wmdietl/cf-ubuntu-jdk17:latest
   timeoutInMinutes: 70
   steps:
   - checkout: self
@@ -353,7 +277,7 @@ jobs:
    - guava_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk8:latest
+  container: wmdietl/cf-ubuntu-jdk8:latest
   steps:
   - checkout: self
     fetchDepth: 25
@@ -365,7 +289,7 @@ jobs:
    - guava_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk11:latest
+  container: wmdietl/cf-ubuntu-jdk11:latest
   steps:
   - checkout: self
     fetchDepth: 25
@@ -376,44 +300,36 @@ jobs:
    - framework_jobs
   pool:
     vmImage: 'ubuntu-latest'
-  container: wmdietl/cf-ubuntu-jdk-latest:latest
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: ./checker/bin-devel/test-guava.sh
-    displayName: test-guava.sh
-- job: guava_jdk19
-  dependsOn:
-   - framework_jobs
-   - guava_jdk17
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk19:latest
+  container: wmdietl/cf-ubuntu-jdk17:latest
   steps:
   - checkout: self
     fetchDepth: 25
   - bash: ./checker/bin-devel/test-guava.sh
     displayName: test-guava.sh
 
 - job: plume_lib_jdk8
+  # Disable test on older JDK
+  condition: false
   dependsOn:
    - canary_jobs
    - plume_lib_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk8:latest
+  container:  wmdietl/cf-ubuntu-jdk8:latest
   steps:
   - checkout: self
     fetchDepth: 25
   - bash: ./checker/bin-devel/test-plume-lib.sh
     displayName: test-plume-lib.sh
 - job: plume_lib_jdk11
+  # Disable test on older JDK
+  condition: false
   dependsOn:
    - canary_jobs
    - plume_lib_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk11:latest
+  container: wmdietl/cf-ubuntu-jdk11:latest
   steps:
   - checkout: self
     fetchDepth: 25
@@ -424,24 +340,12 @@ jobs:
    - canary_jobs
   pool:
     vmImage: 'ubuntu-latest'
-  container: wmdietl/cf-ubuntu-jdk-latest:latest
+  container: wmdietl/cf-ubuntu-jdk17:latest
   steps:
   - checkout: self
     fetchDepth: 25
   - bash: ./checker/bin-devel/test-plume-lib.sh
     displayName: test-plume-lib.sh
-- job: plume_lib_jdk19
-  dependsOn:
-   - canary_jobs
-   - plume_lib_jdk17
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk19:latest
-  steps:
-    - checkout: self
-      fetchDepth: 25
-    - bash: ./checker/bin-devel/test-plume-lib.sh
-      displayName: test-plume-lib.sh
 
 - job: cfinference_jdk8
   dependsOn:
@@ -490,7 +394,7 @@ jobs:
    - jspecify_tests_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk8:latest
+  container: wmdietl/cf-ubuntu-jdk8:latest
   timeoutInMinutes: 70
   steps:
   - checkout: self
@@ -503,7 +407,7 @@ jobs:
    - jspecify_tests_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk11:latest
+  container: wmdietl/cf-ubuntu-jdk11:latest
   steps:
   - checkout: self
     fetchDepth: 25
@@ -512,20 +416,7 @@ jobs:
 - job: jspecify_tests_jdk17
   pool:
     vmImage: 'ubuntu-latest'
-  container: wmdietl/cf-ubuntu-jdk-latest:latest
-  timeoutInMinutes: 70
-  steps:
-  - checkout: self
-    fetchDepth: 25
-  - bash: ./checker/bin-devel/test-jspecify.sh
-    displayName: test-jspecify.sh
-- job: jspecify_tests_jdk19
-  dependsOn:
-   - canary_jobs
-   - jspecify_tests_jdk17
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk19:latest
+  container: wmdietl/cf-ubuntu-jdk17:latest
   timeoutInMinutes: 70
   steps:
   - checkout: self
@@ -570,15 +461,3 @@ jobs:
 #     fetchDepth: 25
 #   - bash: ./checker/bin-devel/test-downstream.sh
 #     displayName: test-downstream.sh
-# - job: downstream_jdk19
-#   dependsOn:
-#    - canary_jobs
-#    - downstream_jdk17
-#   pool:
-#     vmImage: 'ubuntu-latest'
-#   container: mdernst/cf-ubuntu-jdk19:latest
-#   steps:
-#   - checkout: self
-#     fetchDepth: 25
-#   - bash: ./checker/bin-devel/test-downstream.sh
-#     displayName: test-downstream.sh