From 18ebcfde080f44f4d30e0397962657808de3ab4a Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@alum.mit.edu>
Date: Fri, 2 Aug 2019 07:40:36 -0700
Subject: [PATCH 1/4] Azure Pipelines continuous integration (without running
 tests, for now)

---
 azure-pipelines.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 0000000000000..fb7af2669b3ad
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,22 @@
+jobs:
+- job: build
+  pool:
+    vmImage: 'ubuntu-16.04'
+  container: mdernst/cf-ubuntu-jdk11-plus-buildjdk:latest
+  steps:
+  - checkout: none
+  - bash: env | sort
+    displayName: show environment
+  - bash: git -C jdk pull -q ${BUILD_REPOSITORY_URI} ${BUILD_SOURCEBRANCHNAME} || git clone --depth 1 -q ${BUILD_REPOSITORY_URI} --branch ${BUILD_SOURCEBRANCHNAME}
+    displayName: pull or clone
+  - bash: (export JT_HOME=/jtreg && cd jdk && bash configure --with-jtreg --disable-warnings-as-errors)
+    displayName: configure
+  - bash: make -C jdk images
+    displayName: make images
+  - bash: jdk/build/*/images/jdk/bin/java -version
+    displayName: version
+  # - bash: make -C jdk run-test-tier1
+  #   displayName: make run-test-tier1
+
+trigger:
+  batch: true

From 422196136c9056267d704fdb356450f6e6a0b784 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sat, 3 Aug 2019 08:57:32 -0700
Subject: [PATCH 2/4] Update Azure pipelines YAML file

---
 azure-pipelines.yml | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fb7af2669b3ad..2e2003f72700c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,17 +5,43 @@ jobs:
   container: mdernst/cf-ubuntu-jdk11-plus-buildjdk:latest
   steps:
   - checkout: none
-  - bash: env | sort
+  - bash: |
+      whoami
+      pwd
+      ls -l
+      env | sort
     displayName: show environment
-  - bash: git -C jdk pull -q ${BUILD_REPOSITORY_URI} ${BUILD_SOURCEBRANCHNAME} || git clone --depth 1 -q ${BUILD_REPOSITORY_URI} --branch ${BUILD_SOURCEBRANCHNAME}
+  - bash: |
+      set -ex
+      if [ -d /tmp/plume-scripts ]; \
+        then git -C /tmp/plume-scripts pull > /dev/null 2>&1 ; \
+        else git -C /tmp clone --depth 1 -q https://github.com/plume-lib/plume-scripts.git ; \
+        fi
+      eval `/tmp/plume-scripts/ci-info typetools`
+      CI_REPOSITORY_URI=https://github.com/${CI_ORGANIZATION}/jdk.git
+      ls -al /jdk/.git
+      if [ -d /jdk ]; \
+        then git -C /jdk pull -q ${CI_REPOSITORY_URI} ${CI_BRANCH} ; \
+        else git clone --depth 1 -q ${CI_REPOSITORY_URI} --branch ${CI_BRANCH} /jdk ; \
+        fi
     displayName: pull or clone
-  - bash: (export JT_HOME=/jtreg && cd jdk && bash configure --with-jtreg --disable-warnings-as-errors)
+  # Is it necessary to re-run configure?
+  - bash: |
+      echo "/jdk/build/linux-x86_64-normal-server-release:"
+      ls -al /jdk/build/linux-x86_64-normal-server-release
+      echo "/jdk/build/linux-x86_64-normal-server-release/configure-support:"
+      ls -al /jdk/build/linux-x86_64-normal-server-release/configure-support
+      echo "config.status:"
+      ls -al /jdk/build/linux-x86_64-normal-server-release/configure-support/config.status
+      export JT_HOME=/jtreg
+      cd /jdk
+      bash ./configure --with-jtreg --disable-warnings-as-errors
     displayName: configure
-  - bash: make -C jdk images
+  - bash: make -C /jdk images
     displayName: make images
   - bash: jdk/build/*/images/jdk/bin/java -version
     displayName: version
-  # - bash: make -C jdk run-test-tier1
+  # - bash: make -C /jdk run-test-tier1
   #   displayName: make run-test-tier1
 
 trigger:

From 32da53d90446c8e6407c6629c726c6a2a06fc21d Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sat, 3 Aug 2019 09:03:18 -0700
Subject: [PATCH 3/4] Don't run configure

---
 azure-pipelines.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2e2003f72700c..1960b2af92779 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,18 +25,6 @@ jobs:
         else git clone --depth 1 -q ${CI_REPOSITORY_URI} --branch ${CI_BRANCH} /jdk ; \
         fi
     displayName: pull or clone
-  # Is it necessary to re-run configure?
-  - bash: |
-      echo "/jdk/build/linux-x86_64-normal-server-release:"
-      ls -al /jdk/build/linux-x86_64-normal-server-release
-      echo "/jdk/build/linux-x86_64-normal-server-release/configure-support:"
-      ls -al /jdk/build/linux-x86_64-normal-server-release/configure-support
-      echo "config.status:"
-      ls -al /jdk/build/linux-x86_64-normal-server-release/configure-support/config.status
-      export JT_HOME=/jtreg
-      cd /jdk
-      bash ./configure --with-jtreg --disable-warnings-as-errors
-    displayName: configure
   - bash: make -C /jdk images
     displayName: make images
   - bash: jdk/build/*/images/jdk/bin/java -version

From d38daeb3c02c442e4def6ec8d468c3155c06a837 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sat, 3 Aug 2019 09:18:30 -0700
Subject: [PATCH 4/4] Don't use relative directory name

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1960b2af92779..1acc8e0e343db 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -27,7 +27,7 @@ jobs:
     displayName: pull or clone
   - bash: make -C /jdk images
     displayName: make images
-  - bash: jdk/build/*/images/jdk/bin/java -version
+  - bash: /jdk/build/*/images/jdk/bin/java -version
     displayName: version
   # - bash: make -C /jdk run-test-tier1
   #   displayName: make run-test-tier1