Merge branch 'release-1.8' into cherry-pick-1521-to-release-1.8

Author: smatula

installer/charts/tssc-dh/templates/app-config-content.yaml

@@ -49,24 +49,7 @@ azureDevOps:
 auth:
   environment: production
   providers:
-  {{- $signInPage := "" }}
-  {{- if eq .Values.developerHub.authProvider "oidc" }}
-    {{- $signInPage = "oidc" }}
-    oidc:
-      production:
-        clientId: ${AUTH__OIDC__CLIENT__ID}
-        clientSecret: ${AUTH__OIDC__CLIENT__SECRET}
-        metadataUrl: ${AUTH__OIDC__METADATA__URL}
-        prompt: auto
-        signIn:
-          resolvers:
-          - resolver: preferredUsernameMatchingUserEntityName
-  session:
-    secret:
-      $env: BACKEND_SECRET
-  {{- end }}
-  {{- if eq .Values.developerHub.authProvider "github" }}
-    {{- $signInPage = "github" }}
+  {{- if $githubSecretObj }}
     github:
       production:
         clientId: ${GITHUB__APP__CLIENT__ID}
@@ -81,10 +64,9 @@ auth:
               dangerouslyAllowSignInWithoutUserInCatalog: true
       {{- end }}
   {{- end }}
-  {{- if eq .Values.developerHub.authProvider "gitlab" }}
+  {{- if $gitlabSecretObj }}
     {{- $gitlabSecretData := ($gitlabSecretObj.data | default dict) }}
     {{- if and $gitlabSecretData.clientId $gitlabSecretData.clientSecret }}
-    {{- $signInPage = "gitlab" }}
     gitlab:
       production:
       {{- if ne ($gitlabSecretData.host | b64dec) "gitlab.com" }}
@@ -98,6 +80,20 @@ auth:
               dangerouslyAllowSignInWithoutUserInCatalog: true
     {{- end }}
   {{- end }}
+  {{- if eq .Values.developerHub.authProvider "oidc" }}
+    oidc:
+      production:
+        clientId: ${AUTH__OIDC__CLIENT__ID}
+        clientSecret: ${AUTH__OIDC__CLIENT__SECRET}
+        metadataUrl: ${AUTH__OIDC__METADATA__URL}
+        prompt: auto
+        signIn:
+          resolvers:
+          - resolver: preferredUsernameMatchingUserEntityName
+  session:
+    secret:
+      $env: BACKEND_SECRET
+  {{- end }}
 backend:
   auth:
     keys:
@@ -272,8 +268,8 @@ proxy:
 quay:
   uiUrl: ${QUAY__URL}
 {{- end }}
-{{- if $signInPage }}
-signInPage: {{ $signInPage }}
+{{- if .Values.developerHub.authProvider }}
+signInPage: {{ .Values.developerHub.authProvider }}
 {{- end }}
 techdocs:
   builder: 'local'

installer/charts/tssc-dh/templates/plugins-content.yaml

@@ -65,7 +65,7 @@ plugins:
                     gridColumn: "1 / -1"
                   if:
                     allOf:
-                      - isAzureDevOpsAvailable
+                      - isAzurePipelinesAvailable
 {{- end }}
 {{- if (lookup "v1" "Secret" $integrationNamespace "tssc-github-integration") }}
   - disabled: false

integration-tests/tasks/get-rhads-config.yaml

@@ -28,7 +28,9 @@ spec:
         set -euo pipefail
 
         echo "Downloading rhads-config file:"
-        GIT_REPO="$(jq -r '.git.repo // empty' <<< $JOB_SPEC)"
+        # Extract the repository name from the source_repo_url
+        SOURCE_REPO_URL=$(jq -r '.git.source_repo_url' <<< $JOB_SPEC)
+        GIT_REPO=$(basename "$SOURCE_REPO_URL" .git)
         REPO_ORG=$(jq -r '.git.source_repo_org' <<< $JOB_SPEC)
         # Determine the branch name for the curl command.
         # If source_repo_branch starts with "refs/heads/", strip that prefix; otherwise, use as is.