Wifi 13821 adjust test deployments (#975)

* Should qa01 install should point to current chart Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> * Attempt to get some other tests working --------- Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> Co-authored-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com>
2025-10-29 10:02:26 +00:00 · 2024-07-29 09:12:29 -04:00
parent 5736e3280e
commit 8b4ca94f70
7 changed files with 39 additions and 48 deletions
--- a/.github/actions/deploy-sdk-docker-compose/action.yml
+++ b/.github/actions/deploy-sdk-docker-compose/action.yml
@@ -77,8 +77,12 @@ runs:
    - name: Create EC2 instance for CloudSDK
      env:
        EC2_INSTANCE_TYPE: t2.small
-        EC2_SECURITY_GROUP_ID: sg-012299a8201a0761c
        EC2_KEY_NAME: loadsim
+        # for ap-south-1
+        #EC2_SECURITY_GROUP_ID: sg-0dd922b7bc38c0045
+        #VPC_SUBNET_ID: subnet-0d1a2e5efbec9709c
+        # for us-east-2
+        EC2_SECURITY_GROUP_ID: sg-012299a8201a0761c
        VPC_SUBNET_ID: subnet-08ef4ccda4af94c38
      shell: bash
      id: ec2_instance
@@ -163,8 +167,6 @@ runs:
          export OWPROV_SYSTEM_URI_PUBLIC="https://${{ steps.set_outputs.outputs.gateway_url }}:16005";
          export OWANALYTICS_SYSTEM_URI_PUBLIC="https://${{ steps.set_outputs.outputs.gateway_url }}:16009";
          export OWSUB_SYSTEM_URI_PUBLIC="https://${{ steps.set_outputs.outputs.gateway_url }}:16006";
-          export OWRRM_SERVICECONFIG_PRIVATEENDPOINT="http://owrrm.wlan.local:17007";
-          export OWRRM_SERVICECONFIG_PUBLICENDPOINT="http://${{ steps.set_outputs.outputs.gateway_url }}:16789";
          export CERTIFICATES_ALLOWMISMATCH="true";
          ./deploy.sh
        EOF
--- a/.github/workflows/cgw-dev-deployment.yaml
+++ b/.github/workflows/cgw-dev-deployment.yaml
@@ -61,7 +61,7 @@ jobs:
        EOF

  deploy:
-    name: Update OpenLAN Cloud SDK instances
+    name: Update OpenLAN Cloud Gateway instances
    runs-on: ubuntu-latest
    needs:
      - id
@@ -85,9 +85,6 @@ jobs:
      run: |
        curl -s -LO "https://dl.k8s.io/release/v1.27.14/bin/linux/amd64/kubectl"
        sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
-        # Download the binary
-        curl -s -LO "https://github.com/getsops/sops/releases/download/v3.8.1/sops-v3.8.1.linux.amd64"
-        sudo install -o root -g root -m 0755 sops-v3.8.1.linux.amd64 /usr/local/bin/sops
        curl -s -LO "https://github.com/helmfile/helmfile/releases/download/v0.165.0/helmfile_0.165.0_linux_amd64.tar.gz"
        tar xvzf helmfile_0.165.0_linux_amd64.tar.gz helmfile
        sudo install -o root -g root -m 0755 helmfile /usr/local/bin/helmfile
@@ -95,6 +92,16 @@ jobs:
        helm plugin install https://github.com/databus23/helm-diff
        helm plugin install https://github.com/jkroepke/helm-secrets

+    - name: Create certificate file
+      working-directory: wlan-cloud-ucentral-deploy/cgw
+      run: |
+        echo "${{ env.DIGICERT_CERT }}" | base64 -d > websocket-cert.pem
+        echo "${{ env.DIGICERT_KEY }}" | base64 -d > websocket-key.pem
+        ./mkcertconfig websocket-cert.pem websocket-key.pem > values/certs.device.yaml
+        kubectl create secret generic certs --dry-run=client -o yaml \
+          --from-file=websocket-key.pem --from-file=websocket-cert.pem \
+          | grep websocket- >> values/certs.device.yaml
+
    - name: Deploy OpenLAN Cloud Gateway and services
      if: ${{ github.event.inputs.just_component }} == "false"
      working-directory: wlan-cloud-ucentral-deploy/cgw
@@ -128,8 +135,3 @@ jobs:
        kubectl get persistentvolumeclaims --namespace openlan-${{ matrix.namespace }}
        echo "PVC Descriptions:"
        kubectl describe persistentvolumeclaims --namespace openlan-${{ matrix.namespace }}
-
-#    - name: Rollback Cloud SDK
-#      if: failure()
-#      run: |
-#        helm rollback tip-openlan --namespace openlan-${{ matrix.namespace }} --wait --timeout 20m
--- a/.github/workflows/get_redirector_url.yml
+++ b/.github/workflows/get_redirector_url.yml
@@ -36,13 +36,13 @@ jobs:
      matrix: ${{ fromJson( needs.generate-matrix.outputs.matrix ) }}
    steps:
    - name: checkout testing repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
      with:
        repository: Telecominfraproject/wlan-testing
        path: wlan-testing

    - name: checkout pki cert scripts repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
      with:
        repository: Telecominfraproject/wlan-pki-cert-scripts
        path: wlan-pki-cert-scripts
--- a/.github/workflows/ow_docker-compose-upgrade-test.yml
+++ b/.github/workflows/ow_docker-compose-upgrade-test.yml
@@ -37,7 +37,7 @@ jobs:
    runs-on: ubuntu-latest
    env:
      AWS_DEFAULT_OUTPUT: json
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: us-east-2
    outputs:
      gateway_url: ${{ steps.deploy-sdk-docker-compose.outputs.gateway_url }}
      sec_url: ${{ steps.deploy-sdk-docker-compose.outputs.sec_url }}
@@ -45,7 +45,7 @@ jobs:
      instance_name: ${{ steps.deploy-sdk-docker-compose.outputs.instance_name }}
      instance_public_ip: ${{ steps.deploy-sdk-docker-compose.outputs.instance_public_ip }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Use deploy-sdk-docker-compose composite action
        id: deploy-sdk-docker-compose
@@ -66,12 +66,12 @@ jobs:
    needs: [deploy-controller]
    runs-on: ubuntu-latest
    env:
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: us-east-2
    outputs:
      serial_number: ${{ steps.deploy-virtual-ap-instance.outputs.serial_number }}
      instance_id: ${{ steps.deploy-virtual-ap-instance.outputs.instance_id }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Use deploy-virtual-ap-instance composite action
        id: deploy-virtual-ap-instance
@@ -119,7 +119,7 @@ jobs:
  upgrade-controller-deployment:
    name: Upgrade OpenWiFi Cloud SDK
    env:
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: us-east-2
    needs: [deploy-controller, test]
    runs-on: ubuntu-latest
    steps:
@@ -198,7 +198,7 @@ jobs:
    needs: [deploy-controller, test-after-upgrade]
    runs-on: ubuntu-latest
    env:
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: us-east-2
    if: always()
    steps:
      - name: Delete EC2 instance
@@ -212,7 +212,7 @@ jobs:
    needs: [deploy-virtual-ap-instance, test-after-upgrade]
    runs-on: ubuntu-latest
    env:
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: us-east-2
    if: always()
    steps:
      - name: Terminate virtual AP EC2 instance
--- a/.github/workflows/ow_docker-compose.yml
+++ b/.github/workflows/ow_docker-compose.yml
@@ -61,7 +61,7 @@ jobs:
    runs-on: ubuntu-latest
    env:
      AWS_DEFAULT_OUTPUT: json
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: us-east-2
    outputs:
      gateway_url: ${{ steps.deploy-sdk-docker-compose.outputs.gateway_url }}
      sec_url: ${{ steps.deploy-sdk-docker-compose.outputs.sec_url }}
@@ -69,7 +69,7 @@ jobs:
      instance_name: ${{ steps.deploy-sdk-docker-compose.outputs.instance_name }}
      instance_public_ip: ${{ steps.deploy-sdk-docker-compose.outputs.instance_public_ip }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Use deploy-sdk-docker-compose composite action
        id: deploy-sdk-docker-compose
@@ -96,12 +96,12 @@ jobs:
    needs: deploy-controller
    runs-on: ubuntu-latest
    env:
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: us-east-2
    outputs:
      serial_number: ${{ steps.deploy-virtual-ap-instance.outputs.serial_number }}
      instance_id: ${{ steps.deploy-virtual-ap-instance.outputs.instance_id }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Use deploy-virtual-ap-instance composite action
        id: deploy-virtual-ap-instance
@@ -154,7 +154,7 @@ jobs:
    needs: [deploy-controller, test]
    runs-on: ubuntu-latest
    env:
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: us-east-2
    if: always()
    steps:
      - name: Delete EC2 instance
@@ -167,7 +167,7 @@ jobs:
    needs: [deploy-virtual-ap-instance, test]
    runs-on: ubuntu-latest
    env:
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: us-east-2
    if: always()
    steps:
      - name: Terminate virtual AP EC2 instance
--- a/.github/workflows/ow_k8s.yml
+++ b/.github/workflows/ow_k8s.yml
@@ -1,4 +1,4 @@
-name: 2.x testing with Kubernetes deployment
+name: 3.x testing with Kubernetes deployment

 env:
  AWS_EKS_NAME: tip-wlan-main
@@ -37,10 +37,6 @@ on:
        default: 'main'
        description: 'OpenWIFI Subscription (Userportal) version to be deployed'
        required: false
-      owrrm_version:
-        default: 'main'
-        description: 'OpenWIFI radio resource management service version to be deployed'
-        required: false
      id:
        description: 'run identifier'
        required: false
@@ -79,7 +75,7 @@ jobs:
      namespace: ${{ steps.namespace.outputs.value }}
    steps:
    - name: Checkout repo with Helm values
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
      with:
        repository: Telecominfraproject/wlan-cloud-ucentral-deploy
        path: wlan-cloud-ucentral-deploy
@@ -95,10 +91,9 @@ jobs:
      run: |
        aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }}

-    # TODO WIFI-7839 delete when issue is resolved on AWS CLI side
    - name: install kubectl
      run: |
-        curl -s -LO "https://dl.k8s.io/release/v1.27.6/bin/linux/amd64/kubectl"
+        curl -s -LO "https://dl.k8s.io/release/v1.27.14/bin/linux/amd64/kubectl"
        sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl

    - name: Set namespace output
@@ -127,8 +122,7 @@ jobs:
        export OWPROVUI_VERSION=main
        export OWANALYTICS_VERSION=${{ github.event.inputs.owanalytics_version }}
        export OWSUB_VERSION=${{ github.event.inputs.owsub_version }}
-        export OWRRM_VERSION=${{ github.event.inputs.owrrm_version }}
-        export VALUES_FILE_LOCATION=values.openwifi-qa.yaml
+        export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.single-external-db.yaml,values.openwifi-qa.separate-lbs.yaml
        export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }}
        export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }}
        export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }}
@@ -145,17 +139,11 @@ jobs:
        kubectl get pods --namespace openwifi-${{ steps.namespace.outputs.value }}
        kubectl get services --namespace openwifi-${{ steps.namespace.outputs.value }}
        kubectl get persistentvolumeclaims --namespace openwifi-${{ steps.namespace.outputs.value }}
-    - name: Describe pods on deployment failure
+    - name: Describe resources on deployment failure
      if: failure()
      run: |
        kubectl describe pods --namespace openwifi-${{ steps.namespace.outputs.value }}
-    - name: Describe services on deployment failure
-      if: failure()
-      run: |
        kubectl describe services --namespace openwifi-${{ steps.namespace.outputs.value }}
-    - name: Describe persistentvolumeclaims on deployment failure
-      if: failure()
-      run: |
        kubectl describe persistentvolumeclaims --namespace ${{ steps.namespace.outputs.value }}

  deploy-virtual-ap-instance:
@@ -168,7 +156,7 @@ jobs:
      serial_number: ${{ steps.deploy-virtual-ap-instance.outputs.serial_number }}
      instance_id: ${{ steps.deploy-virtual-ap-instance.outputs.instance_id }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Use deploy-virtual-ap-instance composite action
        id: deploy-virtual-ap-instance
@@ -222,10 +210,9 @@ jobs:
        run: |
          aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }}

-      # TODO WIFI-7839 delete when issue is resolved on AWS CLI side
      - name: install kubectl
        run: |
-          curl -s -LO "https://dl.k8s.io/release/v1.27.6/bin/linux/amd64/kubectl"
+          curl -s -LO "https://dl.k8s.io/release/v1.27.14/bin/linux/amd64/kubectl"
          sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl

      - name: Delete Cloud SDK
--- a/.github/workflows/ucentralgw-qa-deployment.yaml
+++ b/.github/workflows/ucentralgw-qa-deployment.yaml
@@ -34,7 +34,7 @@ env:
    {
      "namespace": "qa01",
      "deploy_method": "git",
-      "chart_version": "v3.1.0-RC2",
+      "chart_version": "main",
      "owgw_version": "master",
      "owsec_version": "main",
      "owfms_version": "main",