Skip to content

Commit

Permalink
Merge branch 'release-24-04' into 'main'
Browse files Browse the repository at this point in the history
Release 24 04

See merge request cloudsolutions/automation-templates/f5-azure-arm-templates-v2!150
  • Loading branch information
mikeshimkus committed Apr 16, 2024
2 parents 8128a96 + 97ed6bb commit 0c17774
Show file tree
Hide file tree
Showing 89 changed files with 360 additions and 356 deletions.
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ run_link_checker:
- $RELEASE_RUNTIME_INIT_TESTS == "true"
script:
- make link_check
allow_failure: true

# validate test policy parameters are present
run_test_param_checker:
Expand Down Expand Up @@ -945,6 +946,7 @@ run_link_checker_release:
- $RELEASE_RUNTIME_INIT_TESTS == "true"
script:
- make link_check_release
allow_failure: true

# verifies all examples use the latest AT Components versions
# temporarily allowing failure due to bug with DO 1.29.0
Expand Down
6 changes: 3 additions & 3 deletions automated-test-scripts/data/test_policies/shimkus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ azure-arm-autoscale-example-payg-test:
azure-arm-autoscale-existing-payg-test:
test-url: "file://automated-test-scripts/f5-azure-arm-templates-v2/examples/autoscale/daily_test_existing.yaml"
run: "random"
random-num-of-tests: 1
random-num-of-tests: 0
parameters-files:
- "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/existing/demo.yaml"
- "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/existing/prod.yaml"
Expand Down Expand Up @@ -70,7 +70,7 @@ azure-arm-failover-byol-existing-test:
azure-arm-failover-payg-existing-test:
test-url: "file://automated-test-scripts/f5-azure-arm-templates-v2/examples/failover/daily_test_existing.yaml"
run: "random"
random-num-of-tests: 1
random-num-of-tests: 0
parameters-files:
- "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/demo.yaml"
- "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/prod.yaml"
Expand Down Expand Up @@ -121,7 +121,7 @@ azure-arm-quickstart-byol-existing-test:
azure-arm-quickstart-payg-existing-test:
test-url: "file://automated-test-scripts/f5-azure-arm-templates-v2/examples/quickstart/daily_test_existing.yaml"
run: "random"
random-num-of-tests: 1
random-num-of-tests: 0
parameters-files:
# - "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/quickstart/payg/existing/demo_app_1nic.yaml"
- "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/quickstart/payg/existing/demo_app_2nic.yaml"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ onStart:
- ../../common/verify_bastion_create_env.sh
- ./create_deployment_existing_stack.sh
- ../../common/verify_create.sh
- ./tests/verify_outputs.sh
# remove the following when Azure fixes Fast Path issue 364674860
- ./tests/associate_nsg.sh
- ./tests/verify_login.sh
- ./tests/verify_sync.sh
- ./tests/verify_failover.sh
- ./tests/verify_application.sh
- ./tests/shutdown_active.sh
- ./tests/verify_shutdown_active.sh
- ./tests/verify_application.sh
- ./tests/start_active.sh
- ./tests/verify_start_active.sh
- ./tests/verify_active_standby.sh
- ./tests/verify_application.sh
# uncomment these tests when az vm list-ip-addresses works again
# - ./tests/verify_outputs.sh
# - ./tests/associate_nsg.sh
# - ./tests/verify_login.sh
# - ./tests/verify_sync.sh
# - ./tests/verify_failover.sh
# - ./tests/verify_application.sh
# - ./tests/shutdown_active.sh
# - ./tests/verify_shutdown_active.sh
# - ./tests/verify_application.sh
# - ./tests/start_active.sh
# - ./tests/verify_start_active.sh
# - ./tests/verify_active_standby.sh
# - ./tests/verify_application.sh
- ../../common/delete_deployment.sh
- ../../common/verify_delete.sh
onFail:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ onStart:
- ./create_environment.sh
- ./create_deployment.sh
- ../../common/verify_create.sh
- ./tests/verify_outputs.sh
# remove the following when Azure fixes Fast Path issue 364674860
- ./tests/associate_nsg.sh
- ./tests/verify_login.sh
- ./tests/verify_sync.sh
- ./tests/verify_failover.sh
- ./tests/verify_application.sh
- ./tests/shutdown_active.sh
- ./tests/verify_shutdown_active.sh
- ./tests/verify_application.sh
- ./tests/start_active.sh
- ./tests/verify_start_active.sh
- ./tests/verify_active_standby.sh
- ./tests/verify_application.sh
# uncomment these tests when az vm list-ip-addresses works again
# - ./tests/verify_outputs.sh
# - ./tests/associate_nsg.sh
# - ./tests/verify_login.sh
# - ./tests/verify_sync.sh
# - ./tests/verify_failover.sh
# - ./tests/verify_application.sh
# - ./tests/shutdown_active.sh
# - ./tests/verify_shutdown_active.sh
# - ./tests/verify_application.sh
# - ./tests/start_active.sh
# - ./tests/verify_start_active.sh
# - ./tests/verify_active_standby.sh
# - ./tests/verify_application.sh
- ../../common/delete_deployment.sh
- ../../common/verify_delete.sh
onFail:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ onStart:
- ../../common/verify_bastion_create_env.sh
- ./create_deployment_existing_stack.sh
- ../../common/verify_create.sh
- ./tests/verify_login.sh
- ./tests/verify_runtimeinit_install_params.sh
- ./tests/verify_waf_blocking.sh
- ./tests/verify_secret.sh
- ./tests/verify_identity.sh
- ./tests/verify_outputs.sh
# uncomment these tests when az vm list-ip-addresses works again
# - ./tests/verify_login.sh
# - ./tests/verify_runtimeinit_install_params.sh
# - ./tests/verify_waf_blocking.sh
# - ./tests/verify_secret.sh
# - ./tests/verify_identity.sh
# - ./tests/verify_outputs.sh
- ../../common/delete_deployment.sh
- ../../common/verify_delete.sh
onFail:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ onStart:
- ./create_environment.sh
- ./create_deployment.sh
- ../../common/verify_create.sh
- ./tests/verify_login.sh
- ./tests/verify_runtimeinit_install_params.sh
- ./tests/verify_waf_blocking.sh
- ./tests/verify_secret.sh
- ./tests/verify_identity.sh
- ./tests/verify_outputs.sh
# uncomment these tests when az vm list-ip-addresses works again
# - ./tests/verify_login.sh
# - ./tests/verify_runtimeinit_install_params.sh
# - ./tests/verify_waf_blocking.sh
# - ./tests/verify_secret.sh
# - ./tests/verify_identity.sh
# - ./tests/verify_outputs.sh
- ../../common/delete_deployment.sh
- ../../common/verify_delete.sh
onFail:
Expand Down
2 changes: 1 addition & 1 deletion cloud-tools
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ bigip_ready_enabled: []
extension_packages:
install_operations:
- extensionType: do
extensionVersion: 1.41.0
extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
extensionVersion: 1.43.0
extensionHash: 394f6d97219d016e90016874acb09bd27f7907fda4f1730dea0276900b753a1d
- extensionType: as3
extensionVersion: 3.48.0
extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
extensionVersion: 3.50.2
extensionHash: 620f441bebfdce0261045e34bc7c34f2793b05c0aca62c7ec8e22bbb3f4f35c3
- extensionType: ts
extensionVersion: 1.33.0
extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
extensionVersion: 1.35.0
extensionHash: 839698d98a8651a90b3d509cde4b382338461a253878c9fd00c894699ef0e844
extension_services:
service_operations:
- extensionType: do
Expand Down Expand Up @@ -199,7 +199,7 @@ extension_services:
Custom_WAF_Policy:
class: WAF_Policy
url: >-
https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.0.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
enforcementMode: blocking
ignoreChanges: false
HTTP_Service:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ bigip_ready_enabled: []
extension_packages:
install_operations:
- extensionType: do
extensionVersion: 1.41.0
extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
extensionVersion: 1.43.0
extensionHash: 394f6d97219d016e90016874acb09bd27f7907fda4f1730dea0276900b753a1d
- extensionType: as3
extensionVersion: 3.48.0
extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
extensionVersion: 3.50.2
extensionHash: 620f441bebfdce0261045e34bc7c34f2793b05c0aca62c7ec8e22bbb3f4f35c3
- extensionType: ts
extensionVersion: 1.33.0
extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
extensionVersion: 1.35.0
extensionHash: 839698d98a8651a90b3d509cde4b382338461a253878c9fd00c894699ef0e844
extension_services:
service_operations:
- extensionType: do
Expand Down Expand Up @@ -172,7 +172,7 @@ extension_services:
Custom_WAF_Policy:
class: WAF_Policy
url: >-
https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.0.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
enforcementMode: blocking
ignoreChanges: false
HTTP_Service:
Expand Down
14 changes: 7 additions & 7 deletions examples/autoscale/bigiq/README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions examples/autoscale/bigiq/azuredeploy-existing-network.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "3.0.0.0",
"contentVersion": "3.1.0.0",
"parameters": {
"templateBaseUrl": {
"defaultValue": "https://cdn.f5.com/product/cloudsolutions/",
Expand Down Expand Up @@ -75,7 +75,7 @@
"type": "string"
},
"bigIpRuntimeInitConfig": {
"defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.0.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml",
"defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml",
"metadata": {
"description": "Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration."
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "3.0.0.0",
"contentVersion": "3.1.0.0",
"parameters": {
"allowUsageAnalytics": {
"value": true
},
"artifactLocation": {
"value": "f5-azure-arm-templates-v2/v3.0.0.0/examples/"
"value": "f5-azure-arm-templates-v2/v3.1.0.0/examples/"
},
"bigIpImage": {
"value": "f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:17.1.100002"
Expand All @@ -27,7 +27,7 @@
"value": 0
},
"bigIpRuntimeInitConfig": {
"value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.0.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml"
"value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml"
},
"bigIpRuntimeInitPackageUrl": {
"value": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run"
Expand Down
4 changes: 2 additions & 2 deletions examples/autoscale/bigiq/azuredeploy.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "3.0.0.0",
"contentVersion": "3.1.0.0",
"parameters": {
"templateBaseUrl": {
"defaultValue": "https://cdn.f5.com/product/cloudsolutions/",
Expand Down Expand Up @@ -68,7 +68,7 @@
"type": "string"
},
"bigIpRuntimeInitConfig": {
"defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.0.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml",
"defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml",
"metadata": {
"description": "Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration."
},
Expand Down
6 changes: 3 additions & 3 deletions examples/autoscale/bigiq/azuredeploy.parameters.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "3.0.0.0",
"contentVersion": "3.1.0.0",
"parameters": {
"allowUsageAnalytics": {
"value": true
Expand All @@ -15,7 +15,7 @@
"value": 1
},
"artifactLocation": {
"value": "f5-azure-arm-templates-v2/v3.0.0.0/examples/"
"value": "f5-azure-arm-templates-v2/v3.1.0.0/examples/"
},
"bigIpImage": {
"value": "f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:17.1.100002"
Expand All @@ -36,7 +36,7 @@
"value": 0
},
"bigIpRuntimeInitConfig": {
"value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.0.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml"
"value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml"
},
"bigIpRuntimeInitPackageUrl": {
"value": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run"
Expand Down
Loading

0 comments on commit 0c17774

Please sign in to comment.