From 1dcc2a57021b56ddac07d5050db49be30d904178 Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 09:37:55 -0700 Subject: [PATCH 01/14] Fix CI push and increase timeout --- cloudbuild.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index a53dcde45..b3eb0f930 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -80,7 +80,7 @@ steps: entrypoint: 'bash' args: - -c - - >- # CI Configuration + - >- # CI Configuration #-compat-report=yanglint /go/bin/cmd_gen -modelRoot=$_MODEL_ROOT -repo-slug=$_REPO_SLUG @@ -89,7 +89,6 @@ steps: -pr-number=$_PR_NUMBER -skipped-validators=confd,yanglint -extra-pyang-versions=2.2.1 - #-compat-report=yanglint -branch=$BRANCH_NAME secretEnv: ['GITHUB_ACCESS_TOKEN'] env: @@ -293,7 +292,7 @@ steps: path: /go id: 'compat-report' -timeout: 600s +timeout: 900s options: machineType: 'E2_HIGHCPU_32' From 9c501dd53bb0303f6c90c9002c92fde3217a0042 Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 09:40:35 -0700 Subject: [PATCH 02/14] remove yanglint comment --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index b3eb0f930..9c4c24184 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -80,7 +80,7 @@ steps: entrypoint: 'bash' args: - -c - - >- # CI Configuration #-compat-report=yanglint + - >- # CI Configuration /go/bin/cmd_gen -modelRoot=$_MODEL_ROOT -repo-slug=$_REPO_SLUG From d2e6fb1d3903622abcc1bc89fb843fd53e1da899 Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 17:20:25 -0700 Subject: [PATCH 03/14] Test with new pyangbind plugin dir --- cloudbuild.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 9c4c24184..ac2276f7b 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -52,7 +52,8 @@ steps: git clone git@github.com:openconfig/models-ci.git /go/src/github.com/openconfig/models-ci cd /go/src/github.com/openconfig/models-ci # Modify the major version to update models-ci version. - branch=$(git tag -l 'v9*' | sort -V | tail -1) + #branch=$(git tag -l 'v9*' | sort -V | tail -1) + branch=local-pyangbind-plugin git checkout $branch volumes: - name: 'ssh' From 475954ed988198ac49881f88bfb35092acfb298c Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 17:24:13 -0700 Subject: [PATCH 04/14] Trigger Build From bca3526165bfcb1bb2eeb265306c4bccb9b63d25 Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 17:33:43 -0700 Subject: [PATCH 05/14] revert timeout increase --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index ac2276f7b..c1483ab2b 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -293,7 +293,7 @@ steps: path: /go id: 'compat-report' -timeout: 900s +timeout: 600s options: machineType: 'E2_HIGHCPU_32' From 7003096524fa34ccc03a173f0b8aaf7c0cff0476 Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 17:47:49 -0700 Subject: [PATCH 06/14] Trigger Build From 37ad0caf09886fd86973eaaa68d569ae9b957ae4 Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 18:03:08 -0700 Subject: [PATCH 07/14] Trigger Build From ff380a57c9514c78ba799c5fcb6b943ebe30583d Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 18:18:08 -0700 Subject: [PATCH 08/14] Trigger Build From cb97bd1ed74868598f3aaf3d5b00027a6dae978d Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 18:34:07 -0700 Subject: [PATCH 09/14] Move pyangbind to compat report due to failing BFD check --- cloudbuild.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index c1483ab2b..31bb8dd50 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -90,6 +90,7 @@ steps: -pr-number=$_PR_NUMBER -skipped-validators=confd,yanglint -extra-pyang-versions=2.2.1 + -compat-report=pyangbind -branch=$BRANCH_NAME secretEnv: ['GITHUB_ACCESS_TOKEN'] env: From 213371277ca19202399bbf3448ac1f06cbd147ce Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 18:52:30 -0700 Subject: [PATCH 10/14] Update to v10 for CI --- cloudbuild.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 31bb8dd50..e02c34e7f 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -52,8 +52,7 @@ steps: git clone git@github.com:openconfig/models-ci.git /go/src/github.com/openconfig/models-ci cd /go/src/github.com/openconfig/models-ci # Modify the major version to update models-ci version. - #branch=$(git tag -l 'v9*' | sort -V | tail -1) - branch=local-pyangbind-plugin + branch=$(git tag -l 'v10.*' | sort -V | tail -1) git checkout $branch volumes: - name: 'ssh' From 662e0713f0ba478dc30915d2328dc2d54ef42013 Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 19:00:58 -0700 Subject: [PATCH 11/14] Test new pyangbind version --- cloudbuild.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index e02c34e7f..e622fe369 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -52,7 +52,8 @@ steps: git clone git@github.com:openconfig/models-ci.git /go/src/github.com/openconfig/models-ci cd /go/src/github.com/openconfig/models-ci # Modify the major version to update models-ci version. - branch=$(git tag -l 'v10.*' | sort -V | tail -1) + #branch=$(git tag -l 'v10.*' | sort -V | tail -1) + branch=pyangbind-version git checkout $branch volumes: - name: 'ssh' @@ -89,8 +90,8 @@ steps: -pr-number=$_PR_NUMBER -skipped-validators=confd,yanglint -extra-pyang-versions=2.2.1 - -compat-report=pyangbind -branch=$BRANCH_NAME + #-compat-report=pyangbind secretEnv: ['GITHUB_ACCESS_TOKEN'] env: - 'GOPATH=/go' From 46ef618af044cc6d340c5854598db6aaa064c9d9 Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 19:02:25 -0700 Subject: [PATCH 12/14] trigger CI --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index e622fe369..561000730 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -91,7 +91,7 @@ steps: -skipped-validators=confd,yanglint -extra-pyang-versions=2.2.1 -branch=$BRANCH_NAME - #-compat-report=pyangbind + -compat-report=pyangbind secretEnv: ['GITHUB_ACCESS_TOKEN'] env: - 'GOPATH=/go' From 57f0b652a242b1a3ba65a984a9891491efa3be66 Mon Sep 17 00:00:00 2001 From: wenovus Date: Thu, 13 Jul 2023 19:13:21 -0700 Subject: [PATCH 13/14] Trigger Build From bf264a407f5bbcf8ac753d512f21bebacedf7f12 Mon Sep 17 00:00:00 2001 From: wenovus Date: Mon, 17 Jul 2023 15:26:10 -0700 Subject: [PATCH 14/14] Ready for review --- cloudbuild.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 561000730..88148e530 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -52,8 +52,7 @@ steps: git clone git@github.com:openconfig/models-ci.git /go/src/github.com/openconfig/models-ci cd /go/src/github.com/openconfig/models-ci # Modify the major version to update models-ci version. - #branch=$(git tag -l 'v10.*' | sort -V | tail -1) - branch=pyangbind-version + branch=$(git tag -l 'v10.*' | sort -V | tail -1) git checkout $branch volumes: - name: 'ssh'