Skip to content

Commit

Permalink
Merge branch 'main' into vishwahiremat/refactorModuleSecrets
Browse files Browse the repository at this point in the history
Signed-off-by: Vishwanath Hiremath <[email protected]>
  • Loading branch information
vishwahiremat committed Mar 25, 2024
2 parents 8e2dfe8 + 22d69ef commit f279d06
Show file tree
Hide file tree
Showing 6 changed files with 607 additions and 72 deletions.
28 changes: 16 additions & 12 deletions .github/scripts/cleanup-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,26 @@ set -e
echo "cleaning up cluster"

# Delete all test resources in queuemessages.
echo "delete all resources in queuemessages.ucp.dev"
kubectl delete queuemessages.ucp.dev -n radius-system --all
if kubectl get crd queuemessages.ucp.dev > /dev/null 2>&1; then
echo "delete all resources in queuemessages.ucp.dev"
kubectl delete queuemessages.ucp.dev -n radius-system --all
fi

# Testing deletion of deployment.apps.

# Delete all test resources in resources without proxy resource.
echo "delete all resources in resources.ucp.dev"
resources=$(kubectl get resources.ucp.dev -n radius-system --no-headers -o custom-columns=":metadata.name")
for r in $resources; do
if [[ $r == scope.local.* || $r == scope.aws.* || -z "$r" ]]; then
echo "skip deletion: $r"
else
echo "delete resource: $r"
kubectl delete resources.ucp.dev $r -n radius-system --ignore-not-found=true
fi
done
if kubectl get crd resources.ucp.dev > /dev/null 2>&1; then
echo "delete all resources in resources.ucp.dev"
resources=$(kubectl get resources.ucp.dev -n radius-system --no-headers -o custom-columns=":metadata.name")
for r in $resources; do
if [[ $r == scope.local.* || $r == scope.aws.* || -z "$r" ]]; then
echo "skip deletion: $r"
else
echo "delete resource: $r"
kubectl delete resources.ucp.dev $r -n radius-system --ignore-not-found=true
fi
done
fi

# Delete all test namespaces.
echo "delete all test namespaces"
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/long-running-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# the previous build is still valid. If valid, the workflow skips the build steps
# and uses the cached 'rad cli' for testing.
#
# Grafana dashboard URL: https://radiuse2e00-dashboard-audycmffgberbghy.wus3.grafana.azure.com/
# Grafana dashboard URL: https://radlrtest00-dashboard-e4ffc0cwggchdhba.wus3.grafana.azure.com

name: Long-running test on Azure

Expand All @@ -44,6 +44,8 @@ permissions:
packages: write # Required for uploading the package

on:
# Enable manual trigger to deploy the latest changes from main.
workflow_dispatch:
schedule:
# Run every 2 hours
- cron: "0 */2 * * *"
Expand Down Expand Up @@ -82,9 +84,9 @@ env:
VALID_RADIUS_BUILD_WINDOW: 86400

# The AKS cluster name
AKS_CLUSTER_NAME: "radiuse2e00-aks"
AKS_CLUSTER_NAME: "radlrtest00-aks"
# The resource group for AKS_CLUSTER_NAME resource.
AKS_RESOURCE_GROUP: "radiuse2e00"
AKS_RESOURCE_GROUP: "radlrtest00"

# Server where terraform test modules are deployed
TF_RECIPE_MODULE_SERVER_URL: "http://tf-module-server.radius-test-tf-module-server.svc.cluster.local"
Expand Down Expand Up @@ -115,7 +117,7 @@ jobs:
path: ./dist/cache
key: radius-test-latest-
- name: Skip build if build is still valid
if: github.event_name != 'pull_request'
if: github.event_name != 'pull_request' && github.event_name != 'workflow_dispatch'
id: skip-build
run: |
# check if the last build time to see if we need to build again
Expand Down Expand Up @@ -499,7 +501,7 @@ jobs:
name: Report test failure
needs: [build, tests]
runs-on: ubuntu-latest
if: failure() && github.repository == 'radius-project/radius'
if: failure() && github.repository == 'radius-project/radius' && github.event_name == 'schedule'
steps:
- name: Create failure issue for failing long running test run
uses: actions/github-script@v6
Expand Down
Loading

0 comments on commit f279d06

Please sign in to comment.