From 2560a2b6ad39fe92560d76d12a33a9599670a444 Mon Sep 17 00:00:00 2001 From: Wang Date: Fri, 23 Jun 2023 15:21:23 -0700 Subject: [PATCH 1/8] TH-102773: Update dotnet 3.1 to tag 3.1-40 --- openshift/api-build-config.yaml | 3 ++- openshift/hangfire-build-config.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openshift/api-build-config.yaml b/openshift/api-build-config.yaml index 7df645c5..8c8a4de8 100644 --- a/openshift/api-build-config.yaml +++ b/openshift/api-build-config.yaml @@ -32,7 +32,8 @@ objects: - annotations: null from: kind: DockerImage - name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24 + # name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24 + name: registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1-40 name: "3.1" referencePolicy: type: Local diff --git a/openshift/hangfire-build-config.yaml b/openshift/hangfire-build-config.yaml index fb2b4d85..af5d595a 100644 --- a/openshift/hangfire-build-config.yaml +++ b/openshift/hangfire-build-config.yaml @@ -17,7 +17,8 @@ objects: - annotations: null from: kind: DockerImage - name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-5 + # name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-5 + name: registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1-40 name: "3.1" referencePolicy: type: Local From 6560ff4d7cdc68aaa4f197b95953622af188f3fa Mon Sep 17 00:00:00 2001 From: Wang Date: Fri, 23 Jun 2023 15:40:14 -0700 Subject: [PATCH 2/8] TH-102773: Update dotnet 3.1 to tag 3.1-24 --- openshift/api-build-config.yaml | 4 ++-- openshift/hangfire-build-config.yaml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/openshift/api-build-config.yaml b/openshift/api-build-config.yaml index 8c8a4de8..594de3af 100644 --- a/openshift/api-build-config.yaml +++ b/openshift/api-build-config.yaml @@ -32,8 +32,8 @@ objects: - annotations: null from: kind: DockerImage - # name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24 - name: registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1-40 + name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24 + # name: registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1-40 name: "3.1" referencePolicy: type: Local diff --git a/openshift/hangfire-build-config.yaml b/openshift/hangfire-build-config.yaml index af5d595a..a1fa3a6e 100644 --- a/openshift/hangfire-build-config.yaml +++ b/openshift/hangfire-build-config.yaml @@ -18,7 +18,8 @@ objects: from: kind: DockerImage # name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-5 - name: registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1-40 + name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24 + # name: registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1-40 name: "3.1" referencePolicy: type: Local From 83670e37f706b594e723b2162b9fca3652220a10 Mon Sep 17 00:00:00 2001 From: Wang Date: Fri, 23 Jun 2023 15:48:22 -0700 Subject: [PATCH 3/8] TH-102773: roll back for test --- openshift/api-build-config.yaml | 1 - openshift/hangfire-build-config.yaml | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/openshift/api-build-config.yaml b/openshift/api-build-config.yaml index 594de3af..7df645c5 100644 --- a/openshift/api-build-config.yaml +++ b/openshift/api-build-config.yaml @@ -33,7 +33,6 @@ objects: from: kind: DockerImage name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24 - # name: registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1-40 name: "3.1" referencePolicy: type: Local diff --git a/openshift/hangfire-build-config.yaml b/openshift/hangfire-build-config.yaml index a1fa3a6e..1512e959 100644 --- a/openshift/hangfire-build-config.yaml +++ b/openshift/hangfire-build-config.yaml @@ -17,9 +17,7 @@ objects: - annotations: null from: kind: DockerImage - # name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-5 - name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24 - # name: registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1-40 + name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-5 name: "3.1" referencePolicy: type: Local From 2b15ca2a6988a23f8c19e2c6418cbc2cdca434b0 Mon Sep 17 00:00:00 2001 From: Wang Date: Fri, 23 Jun 2023 20:00:07 -0700 Subject: [PATCH 4/8] TH102773: update dotnet to 5.0 for fix build error --- openshift/api-build-config.yaml | 9 ++++++--- openshift/hangfire-build-config.yaml | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/openshift/api-build-config.yaml b/openshift/api-build-config.yaml index 7df645c5..07dc3c08 100644 --- a/openshift/api-build-config.yaml +++ b/openshift/api-build-config.yaml @@ -32,8 +32,10 @@ objects: - annotations: null from: kind: DockerImage - name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24 - name: "3.1" + # name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24 + name: registry.redhat.io/rhel8/dotnet-50:5.0-4 + # name: "3.1" + name: "5.0" referencePolicy: type: Local - apiVersion: v1 @@ -79,7 +81,8 @@ objects: value: Hmcr.Api/Hmcr.Api.csproj from: kind: ImageStreamTag - name: "dotnet-31-rhel7:3.1" + # name: "dotnet-31-rhel7:3.1" + name: "dotnet-50-rhel8:5.0" type: Source parameters: - description: Name of the project (HMCR) diff --git a/openshift/hangfire-build-config.yaml b/openshift/hangfire-build-config.yaml index 1512e959..0d6b166b 100644 --- a/openshift/hangfire-build-config.yaml +++ b/openshift/hangfire-build-config.yaml @@ -17,8 +17,10 @@ objects: - annotations: null from: kind: DockerImage - name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-5 - name: "3.1" + # name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-5 + name: registry.redhat.io/rhel8/dotnet-50:5.0-4 + # name: "3.1" + name: "5.0" referencePolicy: type: Local - apiVersion: v1 @@ -64,7 +66,8 @@ objects: value: Hmcr.Hangfire/Hmcr.Hangfire.csproj from: kind: ImageStreamTag - name: "dotnet-31-rhel7:3.1" + # name: "dotnet-31-rhel7:3.1" + name: "dotnet-50-rhel8:5.0" type: Source parameters: - description: Name of the project (HMCR) From 1f8b038abbbf17e3f95f1d0eb48f6f6b0bfef481 Mon Sep 17 00:00:00 2001 From: Wang Date: Fri, 23 Jun 2023 20:07:35 -0700 Subject: [PATCH 5/8] TH102773: update dotnet to 7.0 for fix build error --- openshift/api-build-config.yaml | 6 +++--- openshift/hangfire-build-config.yaml | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/openshift/api-build-config.yaml b/openshift/api-build-config.yaml index 07dc3c08..0e4b6796 100644 --- a/openshift/api-build-config.yaml +++ b/openshift/api-build-config.yaml @@ -33,9 +33,9 @@ objects: from: kind: DockerImage # name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24 - name: registry.redhat.io/rhel8/dotnet-50:5.0-4 + name: registry.redhat.io/rhel8/dotnet-70-runtime # name: "3.1" - name: "5.0" + name: "7.0" referencePolicy: type: Local - apiVersion: v1 @@ -82,7 +82,7 @@ objects: from: kind: ImageStreamTag # name: "dotnet-31-rhel7:3.1" - name: "dotnet-50-rhel8:5.0" + name: "dotnet-70-rhel8:7.0" type: Source parameters: - description: Name of the project (HMCR) diff --git a/openshift/hangfire-build-config.yaml b/openshift/hangfire-build-config.yaml index 0d6b166b..053f0657 100644 --- a/openshift/hangfire-build-config.yaml +++ b/openshift/hangfire-build-config.yaml @@ -9,7 +9,8 @@ objects: - apiVersion: "v1" kind: ImageStream metadata: - name: dotnet-31-rhel7 + # name: dotnet-31-rhel7 + name: dotnet-70-rhel8:7.0 spec: lookupPolicy: local: false @@ -18,9 +19,9 @@ objects: from: kind: DockerImage # name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-5 - name: registry.redhat.io/rhel8/dotnet-50:5.0-4 + name: registry.redhat.io/rhel8/dotnet-70-runtime # name: "3.1" - name: "5.0" + name: "7.0" referencePolicy: type: Local - apiVersion: v1 @@ -67,7 +68,7 @@ objects: from: kind: ImageStreamTag # name: "dotnet-31-rhel7:3.1" - name: "dotnet-50-rhel8:5.0" + name: "dotnet-70-rhel8:7.0" type: Source parameters: - description: Name of the project (HMCR) From 87efa3a9df0d0bccdcd33cef89368ee731d927f6 Mon Sep 17 00:00:00 2001 From: Wang Date: Fri, 23 Jun 2023 20:09:42 -0700 Subject: [PATCH 6/8] TH102773: update dotnet to 5.0 for fix build error --- openshift/api-build-config.yaml | 3 ++- openshift/hangfire-build-config.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openshift/api-build-config.yaml b/openshift/api-build-config.yaml index 0e4b6796..cdc3e8b5 100644 --- a/openshift/api-build-config.yaml +++ b/openshift/api-build-config.yaml @@ -24,7 +24,8 @@ objects: - apiVersion: "v1" kind: ImageStream metadata: - name: dotnet-31-rhel7 + # name: dotnet-31-rhel7 + name: dotnet-50-rhel8 spec: lookupPolicy: local: false diff --git a/openshift/hangfire-build-config.yaml b/openshift/hangfire-build-config.yaml index 053f0657..50051db5 100644 --- a/openshift/hangfire-build-config.yaml +++ b/openshift/hangfire-build-config.yaml @@ -10,7 +10,7 @@ objects: kind: ImageStream metadata: # name: dotnet-31-rhel7 - name: dotnet-70-rhel8:7.0 + name: dotnet-70-rhel8 spec: lookupPolicy: local: false From cc462dad8e0d5ff9c0d1cd52883a2691daace5f1 Mon Sep 17 00:00:00 2001 From: Wang Date: Fri, 23 Jun 2023 20:52:08 -0700 Subject: [PATCH 7/8] TH102773: update dotnet to 7.0 for fix build error --- openshift/api-build-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/api-build-config.yaml b/openshift/api-build-config.yaml index cdc3e8b5..cc36f080 100644 --- a/openshift/api-build-config.yaml +++ b/openshift/api-build-config.yaml @@ -25,7 +25,7 @@ objects: kind: ImageStream metadata: # name: dotnet-31-rhel7 - name: dotnet-50-rhel8 + name: dotnet-70-rhel8 spec: lookupPolicy: local: false From 0498d8c355dc71af7138d6d40e766e9e83aa315a Mon Sep 17 00:00:00 2001 From: Wang Date: Fri, 23 Jun 2023 22:37:45 -0700 Subject: [PATCH 8/8] TH-102773: update dotnet to 3.1-40 --- openshift/api-build-config.yaml | 8 +++----- openshift/hangfire-build-config.yaml | 12 ++++-------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/openshift/api-build-config.yaml b/openshift/api-build-config.yaml index cc36f080..dd5ddfbb 100644 --- a/openshift/api-build-config.yaml +++ b/openshift/api-build-config.yaml @@ -24,8 +24,7 @@ objects: - apiVersion: "v1" kind: ImageStream metadata: - # name: dotnet-31-rhel7 - name: dotnet-70-rhel8 + name: dotnet-31-rhel7 spec: lookupPolicy: local: false @@ -34,7 +33,7 @@ objects: from: kind: DockerImage # name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24 - name: registry.redhat.io/rhel8/dotnet-70-runtime + name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-40 # name: "3.1" name: "7.0" referencePolicy: @@ -82,8 +81,7 @@ objects: value: Hmcr.Api/Hmcr.Api.csproj from: kind: ImageStreamTag - # name: "dotnet-31-rhel7:3.1" - name: "dotnet-70-rhel8:7.0" + name: "dotnet-31-rhel7:3.1" type: Source parameters: - description: Name of the project (HMCR) diff --git a/openshift/hangfire-build-config.yaml b/openshift/hangfire-build-config.yaml index 50051db5..79754159 100644 --- a/openshift/hangfire-build-config.yaml +++ b/openshift/hangfire-build-config.yaml @@ -9,8 +9,7 @@ objects: - apiVersion: "v1" kind: ImageStream metadata: - # name: dotnet-31-rhel7 - name: dotnet-70-rhel8 + name: dotnet-31-rhel7 spec: lookupPolicy: local: false @@ -18,10 +17,8 @@ objects: - annotations: null from: kind: DockerImage - # name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-5 - name: registry.redhat.io/rhel8/dotnet-70-runtime - # name: "3.1" - name: "7.0" + name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-40 + name: "3.1" referencePolicy: type: Local - apiVersion: v1 @@ -67,8 +64,7 @@ objects: value: Hmcr.Hangfire/Hmcr.Hangfire.csproj from: kind: ImageStreamTag - # name: "dotnet-31-rhel7:3.1" - name: "dotnet-70-rhel8:7.0" + name: "dotnet-31-rhel7:3.1" type: Source parameters: - description: Name of the project (HMCR)