From e9527c1c929344807cd50858c0bab42ca275b9e1 Mon Sep 17 00:00:00 2001
From: lenhattan86 <lenhattan86@users.noreply.github.com>
Date: Tue, 5 Oct 2021 21:24:13 -0700
Subject: [PATCH] Fix CI & compile error (#325)

CI error
compiling error after mesos lib upgraded
---
 .github/workflows/main.yml                       |  2 +-
 CHANGELOG.md                                     |  2 +-
 .../benchmark/fakes/FakeSchedulerDriver.java     | 16 ++++++++++++++++
 .../aurora/scheduler/app/local/FakeMaster.java   |  3 ++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3066c3ace..378999017 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ on:
       - master
 jobs:
   build:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v1
     - uses: actions/setup-java@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42c7a1df2..7363c8bb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -115,4 +115,4 @@ Aurora Scheduler 0.23.0
   * #13 - Upgrading to Mesos 1.7.x
   * #12 - Improve resume/pause update with regards to previously failed instances
   * #10 - Moving out code for Thermos, Thermos Observer, and the python 2 client.
-  * #3 - Adding support for using an IP as a resource
+  * #3 - Adding support for using an IP as a resource
\ No newline at end of file
diff --git a/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java b/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java
index 07296e84b..9dcaafed5 100644
--- a/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java
+++ b/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java
@@ -16,6 +16,7 @@
 import java.util.Collection;
 
 import org.apache.mesos.Protos;
+import org.apache.mesos.Protos.FrameworkInfo;
 import org.apache.mesos.Protos.Status;
 import org.apache.mesos.SchedulerDriver;
 
@@ -141,4 +142,19 @@ public Protos.Status reconcileTasks(
   public Status suppressOffers() {
     return null;
   }
+
+  @Override
+  public Status reviveOffers(Collection<String> roles) {
+    return null;
+  }
+
+  @Override
+  public Status updateFramework(FrameworkInfo frameworkInfo, Collection<String> suppressedRoles) {
+    return null;
+  }
+
+  @Override
+  public Status suppressOffers(Collection<String> roles) {
+    return null;
+  }
 }
diff --git a/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java b/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
index 6419ba97a..287fbad0a 100644
--- a/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
+++ b/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
@@ -39,6 +39,7 @@
 import org.apache.mesos.Protos.ExecutorID;
 import org.apache.mesos.Protos.Filters;
 import org.apache.mesos.Protos.FrameworkID;
+import org.apache.mesos.Protos.FrameworkInfo;
 import org.apache.mesos.Protos.MasterInfo;
 import org.apache.mesos.Protos.Offer;
 import org.apache.mesos.Protos.OfferID;
@@ -301,7 +302,7 @@ public Status reconcileTasks(Collection<TaskStatus> statuses) {
   }
 
   @Override
-  public Status updateFramework(org.apache.mesos.Protos.FrameworkInfo frameworkInfo, Collection<String> suppressedRoles) {
+  public Status updateFramework(FrameworkInfo frameworkInfo, Collection<String> suppressedRoles) {
     throw new UnsupportedOperationException();
   }