Merge branch 'main' into update-web-ui

Author: vigneshintel

.github/workflows/post-merge-scorecard.yml

@@ -0,0 +1,27 @@
+---
+# SPDX-FileCopyrightText: (C) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+name: Post-Merge Scorecard CI
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  call-scorecard:
+    permissions:
+      security-events: write   # required for SARIF upload
+      id-token: write
+      contents: read
+
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge-scorecard.yml@d3fe218ea585fb390b73c87f9e482cbe1424829c  # v0.1.68
+    with:
+      project_folder: "."
+    secrets:
+      SYS_ORCH_GITHUB: ${{ secrets.SYS_ORCH_GITHUB }}

.test-dependencies.yaml

@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 test-automation:
-  version: 0.2.13
+  version: 0.3.0

VERSION

@@ -1 +1 @@
-2025.2.0-dev
+2026.0.0-dev

argocd/applications/Chart.yaml

@@ -5,5 +5,5 @@
 apiVersion: v2
 name: argocd-applications
 type: application
-version: 2025.2.0-dev
-appVersion: "2025.2.0-dev"
+version: 2026.0.0-dev
+appVersion: "2026.0.0-dev"

argocd/root-app/Chart.yaml

@@ -5,5 +5,5 @@
 apiVersion: v2
 name: root-app
 type: application
-version: 2025.2.0-dev
-appVersion: "2025.2.0-dev"
+version: 2026.0.0-dev
+appVersion: "2026.0.0-dev"

e2e-tests/installer/auto_install.py

@@ -628,23 +628,23 @@ def configure_provision(self):
 
         if self.SMTP_URL != None and self.SMTP_URL != 'null':
             print("Inserting smtp_url into values tfvar file")
-        self.insert_smtp_details_helper("smtp_url", self.SMTP_URL)
+            self.insert_smtp_details_helper("smtp_url", self.SMTP_URL)
 
         if self.SMTP_PORT != None and self.SMTP_PORT != 'null':
             print("Inserting smtp_port into values tfvar file")
-        self.insert_smtp_details_helper("smtp_port", self.SMTP_PORT)
+            self.insert_smtp_details_helper("smtp_port", self.SMTP_PORT)
 
         if self.SMTP_FROM != None and self.SMTP_FROM != 'null':
             print("Inserting smtp_from into values tfvar file")
-        self.insert_smtp_details_helper("smtp_from", self.SMTP_FROM)
+            self.insert_smtp_details_helper("smtp_from", self.SMTP_FROM)
 
         if self.SMTP_USER != None and self.SMTP_USER != 'null':
             print("Inserting smtp_user into values tfvar file")
-        self.insert_smtp_details_helper("smtp_user", self.SMTP_USER)
+            self.insert_smtp_details_helper("smtp_user", self.SMTP_USER)
 
         if self.SMTP_PASS != None and self.SMTP_PASS != 'null':
             print("Inserting smtp_pass into values tfvar file")
-        self.insert_smtp_details_helper("smtp_pass", self.SMTP_PASS)
+            self.insert_smtp_details_helper("smtp_pass", self.SMTP_PASS)
 
     def provision_upgrade(self):
         """

on-prem-installers/VERSION

@@ -1 +1 @@
-2025.2.0-dev
+2026.0.0-dev

on-prem-installers/onprem/onprem.env

@@ -15,7 +15,7 @@
 export RELEASE_SERVICE_URL=registry-rs.edgeorchestration.intel.com
 
 # Deployment Version - Version of Edge Orchestrator to deploy
-export DEPLOY_VERSION=v2025.2.0
+export DEPLOY_VERSION=v2026.0.0
 
 # Installer Profile - Deployment profile (onprem, onprem-dev, etc.)
 export ORCH_INSTALLER_PROFILE=onprem

terraform/orchestrator/scripts/access_script.tftpl

@@ -9,7 +9,7 @@ set -ex
 REGISTRY_URL="registry-rs.edgeorchestration.intel.com"
 RS_PATH="edge-orch/common/files/on-prem"
 ORAS_VERSION="1.1.0"
-ORCH_VERSION="2025.2.0"
+ORCH_VERSION="2026.0.0"
 
 # Refresh token can be provided as a first argument
 # refresh_token=$1