From 925209db65380b8a4ca68ac958fea89927ae798d Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Mon, 22 Nov 2021 15:23:29 +0300 Subject: [PATCH 1/3] Chg: upgrade openwifi clusters to v2.4.0-RC2 --- .github/workflows/ucentralgw-dev-deployment.yaml | 10 +++++----- .github/workflows/ucentralgw-qa-deployment.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ucentralgw-dev-deployment.yaml b/.github/workflows/ucentralgw-dev-deployment.yaml index f94f11505..489066273 100644 --- a/.github/workflows/ucentralgw-dev-deployment.yaml +++ b/.github/workflows/ucentralgw-dev-deployment.yaml @@ -31,12 +31,12 @@ env: { "namespace": "dev01", "deploy_method": "git", - "chart_version": "v2.4.0-RC1", - "owgw_version": "v2.4.0-RC1", - "owsec_version": "v2.4.0-RC1", - "owfms_version": "v2.4.0-RC1", + "chart_version": "v2.4.0-RC2", + "owgw_version": "v2.4.0-RC2", + "owsec_version": "v2.4.0-RC2", + "owfms_version": "v2.4.0-RC2", "owprov_version": "main", - "owgwui_version": "v2.4.0-RC1", + "owgwui_version": "v2.4.0-RC2", "owprovui_version": "main" } ]' diff --git a/.github/workflows/ucentralgw-qa-deployment.yaml b/.github/workflows/ucentralgw-qa-deployment.yaml index bc8d12c01..f314630cd 100644 --- a/.github/workflows/ucentralgw-qa-deployment.yaml +++ b/.github/workflows/ucentralgw-qa-deployment.yaml @@ -31,12 +31,12 @@ env: { "namespace": "qa01", "deploy_method": "git", - "chart_version": "v2.4.0-RC1", - "owgw_version": "v2.4.0-RC1", - "owsec_version": "v2.4.0-RC1", - "owfms_version": "v2.4.0-RC1", + "chart_version": "v2.4.0-RC2", + "owgw_version": "v2.4.0-RC2", + "owsec_version": "v2.4.0-RC2", + "owfms_version": "v2.4.0-RC2", "owprov_version": "main", - "owgwui_version": "v2.4.0-RC1", + "owgwui_version": "v2.4.0-RC2", "owprovui_version": "main" } ]' From ded50982f9a73cac3b3b828f20b8800676a9b239 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 22 Nov 2021 17:39:01 +0100 Subject: [PATCH 2/3] write cloud controller DNS records to hosts file (#289) Signed-off-by: Max Brenner --- .github/workflows/quali.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/quali.yml b/.github/workflows/quali.yml index 8315ff510..c4f861a41 100644 --- a/.github/workflows/quali.yml +++ b/.github/workflows/quali.yml @@ -154,9 +154,6 @@ jobs: id: reservation run: echo ::set-output name=identifier::$(echo ${{ steps.start.outputs.res_id }} | cut -d "-" -f 1) - - name: wait for DNS to propagate - run: sleep 300 - - name: get EKS access credentials run: aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }} @@ -502,10 +499,13 @@ jobs: apt-get install -y dnsutils HOSTS="sec-${{ steps.reservation.outputs.identifier }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.identifier }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.identifier }}.cicd.lab.wlan.tip.build" for HOST in \$HOSTS; do - until sleep 1; host \$HOST; do :; done + until sleep 1; getent hosts \$HOST; do :; done + getent hosts \$HOST >> /etc/hosts echo "DNS record for \$HOST resolved successfully!" done + cat /etc/hosts + cd tests pytest -m "${{ needs.vars.outputs.marker_expression }}" -s -vvv --testbed="basic" --alluredir=/tmp/allure-results -o firmware="${{ needs.vars.outputs.ap_version }}" ret=\$? From ab1d88242e2c1e38d52659bd93a39043bf9c5632 Mon Sep 17 00:00:00 2001 From: shivamcandela Date: Mon, 22 Nov 2021 22:23:38 +0530 Subject: [PATCH 3/3] skip_lf condition is wrong Signed-off-by: shivamcandela --- tests/fixtures_2x.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixtures_2x.py b/tests/fixtures_2x.py index 65320a971..d0ab38050 100644 --- a/tests/fixtures_2x.py +++ b/tests/fixtures_2x.py @@ -661,7 +661,7 @@ class Fixtures_2x: ] ssid_data.append(ssid) lf_tools.ssid_list.append(ssid_info_sdk[interface][0]) - if skip_lf: + if not skip_lf: lf_tools.dut_idx_mapping = idx_mapping lf_tools.update_ssid(ssid_data=ssid_data) except Exception as e: