Remove build_variant

No longer distinguishing between "client" and "server" JDKs or runs.

3 files changed, 7 insertions, 10 deletions

diff --git a/archive-image b/archive-image
index fd2beee..178247a 100755
--- a/archive-image
+++ b/archive-image
@@ -34,9 +34,8 @@ if [ $# -lt 3 ]; then
 fi
 
 build_version=$JDK_VERSION
-build_config=$2
-build_type=$3
-build_label=$4
+build_type=$2
+build_label=$3
 image_dir=$BUILD_DIR/${build_config}-${build_type},label=${build_label}/$YEAR/$DAY_OF_YEAR
 
 if [ $(echo ${build_version} | tr -d u) -lt 9 ]; then
@@ -47,7 +46,7 @@ fi
 
 if [ -d $image_dir ]; then
     human_date=$(doy2date $YEAR $DAY_OF_YEAR "%Y-%m-%d")
-    tar -acf $image_dir/jdk${build_version}-${build_config}-${build_type}-${human_date}.tar.gz \
+    tar -acf $image_dir/jdk${build_version}-${build_type}-${human_date}.tar.gz \
     --exclude=demo --exclude=sample --exclude=man \
-    --transform="s/./jdk${build_version}-${build_config}-${build_type}-${human_date}/" -C $jdk_image_dir .
+    --transform="s/./jdk${build_version}-${build_type}-${human_date}/" -C $jdk_image_dir .
 fi
diff --git a/make-summary-page.py b/make-summary-page.py
index c8ffda3..dd93b60 100755
--- a/make-summary-page.py
+++ b/make-summary-page.py
@@ -50,7 +50,7 @@ def add_latest_results(body):
     human_readable_date = result_date.strftime("%a, %d %b %Y")
     body <= H2("Test Result Summary for {}".format(human_readable_date))
     table = TABLE(border=1)
-    table <= TR(TH('JVM Variant') + TH('Build Type') + TH('JTREG report') + TH('Passed') + TH('Failed') + TH('Error') + TH('Not run') + TH('Recent Results'))
+    table <= TR(TH(TH('Build Type') + TH('JTREG report') + TH('Passed') + TH('Failed') + TH('Error') + TH('Not run') + TH('Recent Results'))
     for build_config in sorted(os.listdir(report_dir)):
         if "." in build_config:
             continue
@@ -61,8 +61,7 @@ def add_latest_results(body):
             stats = jtdiff_stats(jt_report_path)
             if stats:
                 row = TR()
-                row <= TD(build_config.split('-')[0])
-                row <= TD(build_config.split('-')[1])
+                row <= TD(build_config)
                 row <= TD(A(jtreg_category, href="{0}/html/index.html".format(jt_report_path)))
                 row <= TD(A(stats[0], href="{}/html/passed.html".format(jt_report_path)), align="right")
                 row <= TD(A(stats[1], href="{}/html/failed.html".format(jt_report_path)), align="right", Class='failedCell')
diff --git a/publish b/publish
index 6530d33..f41b0ce 100755
--- a/publish
+++ b/publish
@@ -38,8 +38,7 @@ d=$1/$(basename $TOP_DIR)
 build_node=$2
 ssh ${PUBLISH_HOST} mkdir -p $d
 cleanup
-archive-image server release $build_node
-archive-image client release $build_node
+archive-image release $build_node
 super-diff
 make-summaries
 make-front-page $TOP_DIR > $TOP_DIR/index.html