From f8dedfaf490af0f76d45eea1e1363987783fb649 Mon Sep 17 00:00:00 2001
From: Jianhong Yin <jiyin@redhat.com>
Date: Sat, 7 Oct 2023 19:35:27 +0800
Subject: [PATCH] bkr-job schema: add optional task attrs 'keepchanges',
 'fetch_opts'

Now Restraint supports new features by adding new xml element e.g:
<task name="/fs/es" keepchanges="yes" fetch_opts="retry=8,timeo=8">

But Beaker side has not updated the job schema, This results in us
not being able to use these new features of Restraint in integrated
mode.
---
 Common/bkr/common/schema/beaker-job.rnc |  4 +++-
 Common/bkr/common/schema/beaker-job.rng | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Common/bkr/common/schema/beaker-job.rnc b/Common/bkr/common/schema/beaker-job.rnc
index f4977db3e..8662abbf6 100644
--- a/Common/bkr/common/schema/beaker-job.rnc
+++ b/Common/bkr/common/schema/beaker-job.rnc
@@ -439,7 +439,9 @@ task =
          "          "
        ]
      ]
-     attribute name { text }
+     attribute name { text },
+     attribute keepchanges { text }?,
+     attribute fetch_opts { text }?
      | (element fetch {
           [
             a:documentation [
diff --git a/Common/bkr/common/schema/beaker-job.rng b/Common/bkr/common/schema/beaker-job.rng
index bf7922d99..43f8ca08e 100644
--- a/Common/bkr/common/schema/beaker-job.rng
+++ b/Common/bkr/common/schema/beaker-job.rng
@@ -433,6 +433,19 @@ the Free Software Foundation; either version 2 of the License, or
             task must exist in Beaker's task library.
           </a:documentation>
         </attribute>
+	<optional>
+	  <attribute name="keepchanges">
+	    <a:documentation xml:lang="en">
+	      Enable the Restraint keepchanges feature.
+	    </a:documentation>
+	  </attribute>
+	  <attribute name="fetch_opts">
+	    <a:documentation xml:lang="en">
+	      Restraint fetch options, e.g:
+                fetch_opts="retry=8,timeo=16,abort-recipe-on-fetch-fail"
+                fetch_opts="retry=8,keepchanges"
+	    </a:documentation>
+	</optional>
         <group>
           <element name="fetch">
             <attribute name="url">