From 897321670a9b18a9d94b2825376d0e43c7b0ddc2 Mon Sep 17 00:00:00 2001 From: RavinderReddyF5 Date: Tue, 26 Nov 2024 17:08:03 +0530 Subject: [PATCH 1/4] fix ci/cd --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ee046cac9..655f4fca1 100755 --- a/.travis.yml +++ b/.travis.yml @@ -100,6 +100,7 @@ deploy: # script: # - ./docs/scripts/docker-docs.sh ./docs/scripts/test-docs.sh && ./docs/scripts/deploy-docs.sh publish-product-docs-to-prod openstack/agent $CTLR_VERSION + notifications: slack: rooms: From 9e07b1ee9be6938e37c5ff878dab82fc92f2aae4 Mon Sep 17 00:00:00 2001 From: RavinderReddyF5 Date: Tue, 26 Nov 2024 17:09:53 +0530 Subject: [PATCH 2/4] fix ci/cd --- .travis.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 655f4fca1..c3d547d7d 100755 --- a/.travis.yml +++ b/.travis.yml @@ -90,16 +90,15 @@ deploy: # tags: true # python: 2.7 # skip_cleanup: true - - # - provider: script - # skip_cleanup: true - # on: - # all_branches: true - # repo: F5Networks/f5-openstack-agent - # tags: true - # script: - # - ./docs/scripts/docker-docs.sh ./docs/scripts/test-docs.sh && ./docs/scripts/deploy-docs.sh publish-product-docs-to-prod openstack/agent $CTLR_VERSION + - provider: script + skip_cleanup: true + on: + all_branches: true + repo: F5Networks/f5-openstack-agent + tags: true + script: + - ./docs/scripts/docker-docs.sh ./docs/scripts/test-docs.sh && ./docs/scripts/deploy-docs.sh publish-product-docs-to-prod openstack/agent $CTLR_VERSION notifications: slack: From ece693d29e1cf1bc938e0cc5188824c9236c763b Mon Sep 17 00:00:00 2001 From: RavinderReddyF5 Date: Tue, 26 Nov 2024 17:19:21 +0530 Subject: [PATCH 3/4] fix ci/cd --- .travis.yml | 3 +-- f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c3d547d7d..da55a11e9 100755 --- a/.travis.yml +++ b/.travis.yml @@ -90,7 +90,6 @@ deploy: # tags: true # python: 2.7 # skip_cleanup: true - - provider: script skip_cleanup: true on: @@ -106,4 +105,4 @@ notifications: - f5openstackdev:$SLACK_TOKEN#f5-openstack-agent - f5openstackdev:$SLACK_TOKEN#build_status on_success: change - on_failure: always + on_failure: always \ No newline at end of file diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py b/f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py index 9047566dc..f14a1b236 100644 --- a/f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py +++ b/f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py @@ -1954,7 +1954,7 @@ def _update_payload(self, old_resource, resource, service, **kwargs): create_payload = kwargs.get('create_payload', self._create_payload(resource, service)) - keys_ignore = ['expected_codes', 'url_path', 'http_method'] + keys_ignore = ['expected_codes', 'url_path', 'http_method'] for key in self.mutable_props.keys(): if old_resource.get('type') == 'PING' and key in keys_ignore: continue @@ -1965,7 +1965,8 @@ def _update_payload(self, old_resource, resource, service, **kwargs): if old != new: prop = self.mutable_props[key] payload[prop] = create_payload[prop] - + + LOG.info('_update_payload MonitorManager') LOG.info(payload) # changing only interval needs to update timeout as well if 'interval' in payload: From 852d785e4668722344848905c56e5abfbcb33fbd Mon Sep 17 00:00:00 2001 From: RavinderReddyF5 Date: Tue, 26 Nov 2024 20:16:53 +0530 Subject: [PATCH 4/4] fix ci/cd --- .travis.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index da55a11e9..6359135b8 100755 --- a/.travis.yml +++ b/.travis.yml @@ -66,6 +66,7 @@ script: after_success: - md5sum ${PKG_RELEASE_EL7} > ${PKG_RELEASE_EL7}.md5 && md5sum --check ${PKG_RELEASE_EL7}.md5 - md5sum ${PKG_RELEASE_1404} > ${PKG_RELEASE_1404}.md5 && md5sum --check ${PKG_RELEASE_1404}.md5 + deploy: - provider: releases api_key: @@ -90,15 +91,16 @@ deploy: # tags: true # python: 2.7 # skip_cleanup: true - - provider: script - skip_cleanup: true - on: - all_branches: true - repo: F5Networks/f5-openstack-agent - tags: true + # - provider: script + # skip_cleanup: true + # on: + # all_branches: true + # repo: F5Networks/f5-openstack-agent + # tags: true script: - - ./docs/scripts/docker-docs.sh ./docs/scripts/test-docs.sh && ./docs/scripts/deploy-docs.sh publish-product-docs-to-prod openstack/agent $CTLR_VERSION - + - echo $CTLR_VERSION + # # - ./docs/scripts/docker-docs.sh ./docs/scripts/test-docs.sh && ./docs/scripts/deploy-docs.sh publish-product-docs-to-prod openstack/agent $CTLR_VERSION + notifications: slack: rooms: