make/conf/jib-profiles.js

*** 244,11 ***
          "linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x"
      ];
  
      // These are the base setttings for all the main build profiles.
      common.main_profile_base = {
!         dependencies: ["boot_jdk", "gnumake", "jtreg", "jib", "autoconf", "jmh", "jcov"],
          default_make_targets: ["product-bundles", "test-bundles", "static-libs-bundles"],
          configure_args: concat("--enable-jtreg-failure-handler",
              "--with-exclude-translations=es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK",
              "--disable-manpages",
              "--disable-jvm-feature-shenandoahgc",
--- 244,11 ---
          "linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x"
      ];
  
      // These are the base setttings for all the main build profiles.
      common.main_profile_base = {
!         dependencies: ["boot_jdk", "gnumake", "jtreg", "jtregMW", "jib", "autoconf", "jmh", "jcov"],
          default_make_targets: ["product-bundles", "test-bundles", "static-libs-bundles"],
          configure_args: concat("--enable-jtreg-failure-handler",
              "--with-exclude-translations=es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK",
              "--disable-manpages",
              "--disable-jvm-feature-shenandoahgc",

*** 908,11 ***
      // Profiles used to run tests.
      var testOnlyProfiles = {
          "run-test": {
              target_os: input.build_os,
              target_cpu: input.build_cpu,
!             dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ],
              labels: "test",
              environment: {
                  "JT_JAVA": common.boot_jdk_home
              }
          }
--- 908,11 ---
      // Profiles used to run tests.
      var testOnlyProfiles = {
          "run-test": {
              target_os: input.build_os,
              target_cpu: input.build_cpu,
!             dependencies: [ "jtreg", "jtregMW", "gnumake", "boot_jdk", "devkit", "jib" ],
              labels: "test",
              environment: {
                  "JT_JAVA": common.boot_jdk_home
              }
          }

*** 942,11 ***
      var testOnlyProfilesPrebuilt = {
          "run-test-prebuilt": {
              target_os: input.build_os,
              target_cpu: input.build_cpu,
              dependencies: [
!                 "jtreg", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJdk,
                  testedProfileTest
              ],
              src: "src.conf",
              make_args: testOnlyMake,
              environment: {
--- 942,11 ---
      var testOnlyProfilesPrebuilt = {
          "run-test-prebuilt": {
              target_os: input.build_os,
              target_cpu: input.build_cpu,
              dependencies: [
!                 "jtreg", "jtregMW", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJdk,
                  testedProfileTest
              ],
              src: "src.conf",
              make_args: testOnlyMake,
              environment: {

*** 1138,10 ***
--- 1138,18 ---
              environment_name: "JT_HOME",
              environment_path: input.get("jtreg", "home_path") + "/bin",
              configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),
          },
  
+         jtregMW: {
+             organization: common.organization,
+             ext: "zip",
+             revision: "6.0-virtual-1.0",
+             environment_name: "JT_HOME_MW",
+             environment_path: input.get("jtreg", "install_path") + "/jtreg/bin"
+         },
+ 
          jmh: {
              organization: common.organization,
              ext: "tar.gz",
              revision: "1.28+1.0"
          },