From 13e7f216ad43fb6d6d08907e29954a2587030673 Mon Sep 17 00:00:00 2001
From: Leif Madsen <lmadsen@redhat.com>
Date: Tue, 24 Oct 2023 08:58:06 -0400
Subject: [PATCH] Support OCP versions 4.12 through 4.14 (#503)

* Support OCP versions 4.12 through 4.14

Update the stf-attributes to cover OCP 4.12 through 4.14 as our default,
as OCP 4.10 is EOL. Update the Makefile for building to only cover RHOSP
17.1 and 16.2.

* Need html-latest for upstream publish script
---
 common/global/stf-attributes.adoc        | 10 +++++-----
 doc-Service-Telemetry-Framework/Makefile |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/global/stf-attributes.adoc b/common/global/stf-attributes.adoc
index 18859528..f4a9091a 100644
--- a/common/global/stf-attributes.adoc
+++ b/common/global/stf-attributes.adoc
@@ -45,8 +45,8 @@ ifeval::["{build}" == "upstream"]
 :Project: Service{nbsp}Telemetry{nbsp}Framework
 :ProjectShort: STF
 :MessageBus: Apache{nbsp}Qpid{nbsp}Dispatch{nbsp}Router
-:SupportedOpenShiftVersion: 4.10
-:NextSupportedOpenShiftVersion: 4.12
+:SupportedOpenShiftVersion: 4.12
+:NextSupportedOpenShiftVersion: 4.14
 :CodeReadyContainersVersion: 2.6.0
 endif::[]
 
@@ -55,7 +55,7 @@ ifeval::["{build}" == "downstream"]
 :OpenShiftShort: OCP
 :OpenStack: Red{nbsp}Hat{nbsp}OpenStack{nbsp}Platform
 :OpenStackShort: RHOSP
-:OpenStackVersion: 17.0
+:OpenStackVersion: 17.1
 :OpenStackLong: {OpenStack}{nbsp}{OpenStackVersion}
 :OpenStackInstaller: director
 :OVirt: Red{nbsp}Hat{nbsp}Virtualization
@@ -63,6 +63,6 @@ ifeval::["{build}" == "downstream"]
 :Project: Service{nbsp}Telemetry{nbsp}Framework
 :ProjectShort: STF
 :MessageBus: AMQ{nbsp}Interconnect
-:SupportedOpenShiftVersion: 4.10
-:NextSupportedOpenShiftVersion: 4.12
+:SupportedOpenShiftVersion: 4.12
+:NextSupportedOpenShiftVersion: 4.14
 endif::[]
diff --git a/doc-Service-Telemetry-Framework/Makefile b/doc-Service-Telemetry-Framework/Makefile
index 45501d12..e321f39f 100644
--- a/doc-Service-Telemetry-Framework/Makefile
+++ b/doc-Service-Telemetry-Framework/Makefile
@@ -24,7 +24,7 @@ endif
 
 all: html
 
-html: html-latest html171 html170 html162 html13
+html: html-latest html171 html162
 
 html-latest: prepare $(IMAGES_TS) $(DEST_HTML)