diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 2d7f08638a4..6fd6ff8ccae 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -164,3 +164,7 @@ jobs:
       run: go install honnef.co/go/tools/cmd/staticcheck@latest
     - name: Run staticcheck
       run: GOGC=30 staticcheck ./...
+    - name: Get Ondatra linter
+      run: go install github.com/openconfig/ondatra/gnmi/migrator@latest
+    - name: Run Ondatra linter
+      run: migrator -json ./feature/... | go run ./tools/lint2annotation
diff --git a/tools/lint2annotation/lint2annotation.go b/tools/lint2annotation/lint2annotation.go
new file mode 100644
index 00000000000..a31537e5f31
--- /dev/null
+++ b/tools/lint2annotation/lint2annotation.go
@@ -0,0 +1,58 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// The lint2annotation command converts Go analysis Diagnostic messages into GitHub annotations.
+package main
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io"
+	"log"
+	"os"
+	"strings"
+)
+
+type diag struct {
+	Posn    string `json:"posn"`
+	Message string `json:"message"`
+}
+
+type jsonOutput map[string]map[string][]diag
+
+var (
+	severity = flag.String("severity", "notice", "Sets the severity of the Github annotations")
+)
+
+func main() {
+	flag.Parse()
+	dec := json.NewDecoder(os.Stdin)
+	for {
+		out := jsonOutput{}
+		if err := dec.Decode(&out); err == io.EOF {
+			break
+		} else if err != nil {
+			log.Fatal(err)
+		}
+		for _, pkg := range out {
+			for _, diags := range pkg {
+				for _, diag := range diags {
+					pos := strings.Split(diag.Posn, ":")
+					fmt.Printf("::%s file=%s,line=%s,col=%s::%s\n", *severity, pos[0], pos[1], pos[2], diag.Message)
+				}
+			}
+		}
+	}
+}