Merge branch 'main' into metricforwarder-on-cf

.final_builds/jobs/golangapiserver/index.yml

@@ -23,6 +23,10 @@ builds:
     version: 1036b9da383abe282a90545920d75115471f66334e5f012ff9dd3d26730033e3
     blobstore_id: 8f379321-291a-43f3-7a2f-c064c5d976b6
     sha1: sha256:fee48db9ed6c3f82cffa022052a48cfe7c10a45ed668b5a50474f35dddcdba6e
+  126748a518253b6f5394a2dedfa1b0d37620f8453f2c90304e8dc76ef6206629:
+    version: 126748a518253b6f5394a2dedfa1b0d37620f8453f2c90304e8dc76ef6206629
+    blobstore_id: c3c3b28c-c3b6-41bc-4448-583784543f57
+    sha1: sha256:3497a7cf0ba9c57ab4ad268884d3b6bf638d92ed540250c7bdfb96bb5b9664a9
   143e430b78a525f355eb585c75db666cae1ea108c0b3f5010e409ec3e9c8d30c:
     version: 143e430b78a525f355eb585c75db666cae1ea108c0b3f5010e409ec3e9c8d30c
     blobstore_id: 4cc7947c-2296-4d71-4800-33c332d7dc71

.final_builds/packages/changeloglockcleaner/index.yml

@@ -15,6 +15,10 @@ builds:
     version: 26275f63fc1b801cbf93779dd1f6bc72ed8c4530c372edb227488c7b77fa0fd6
     blobstore_id: 75ea698c-3bd1-4097-4b18-a7c772667e98
     sha1: sha256:75a80f48cee37f744cb51b9e01a335592795dce8ee54d493f48311be86d104fb
+  2ddb536c506af45ecb6e0db40e8295fe526ff9c104414a5798f644d36435799c:
+    version: 2ddb536c506af45ecb6e0db40e8295fe526ff9c104414a5798f644d36435799c
+    blobstore_id: 5e2a2a2c-396b-476d-4765-cf0045aa4b41
+    sha1: sha256:f614d088068de143e7431671c107b92a0db33124ebe6cc49bcf25c78c4e135d3
   319aa8e97897f09de8afb7a8ff29fe4a98c570acac9a24570e7b412d88c675b4:
     version: 319aa8e97897f09de8afb7a8ff29fe4a98c570acac9a24570e7b412d88c675b4
     blobstore_id: 338fa967-c914-4719-6024-052523754d3c

.final_builds/packages/db/index.yml

@@ -303,6 +303,10 @@ builds:
     version: f8d19ce44c68d246655ab84eb12d7e60e663946e0cc6b8e7f50e5e0fcbd332ff
     blobstore_id: a0ba8188-67b3-47e8-601d-53ea8072b568
     sha1: sha256:5abf99b8d97673a6878096234995fed2a34427203e0447bb8d490270df61754b
+  fbc5555ce279e0a7c4c234b63f3e61ede2a20f2f495cdbbda0885bb704c2a6fc:
+    version: fbc5555ce279e0a7c4c234b63f3e61ede2a20f2f495cdbbda0885bb704c2a6fc
+    blobstore_id: 14480769-0651-47b2-686a-a8fdc7867afe
+    sha1: sha256:1dabb884780be9cbb301f861cb10c9d9a9e815a25ec0b62e89d148bd9be1db7c
   fc4cf5e1b4ea1719d57235bce79dc6ee10e59c3635fed7fb39489b05313b8e10:
     version: fc4cf5e1b4ea1719d57235bce79dc6ee10e59c3635fed7fb39489b05313b8e10
     blobstore_id: 22c9237c-9fd8-470e-7a33-1eee4fd15bf0

.final_builds/packages/eventgenerator/index.yml

@@ -103,6 +103,10 @@ builds:
     version: 6b69064630c21a7ede0a1e86d09d067192d68e8f813a54881c3ec0c42c8ccefa
     blobstore_id: 9b13c774-a64e-4af7-782f-e83cfa5035a3
     sha1: sha256:e3c567de829f68d31d49a180af7ee6dcc6b1972a117a514cb36522060f3a6454
+  7cf0b89b2313f2c90f4f59ed25488b9fdec088063429532fcdcfcbba9f43b4b1:
+    version: 7cf0b89b2313f2c90f4f59ed25488b9fdec088063429532fcdcfcbba9f43b4b1
+    blobstore_id: d73351a7-e3d0-4b54-5a38-1d6372f375be
+    sha1: sha256:2788d9c4be61559636c144f53dfac8ba700fe2cb3a3c4cd4f162a63b89ff2583
   7d821c4c0638a88b328776c37596cffe96425af6185823813a151e08244d06cc:
     version: 7d821c4c0638a88b328776c37596cffe96425af6185823813a151e08244d06cc
     blobstore_id: 63d27111-16c1-4813-47fd-feda4160fb4d

.final_builds/packages/golangapiserver/index.yml

@@ -139,6 +139,10 @@ builds:
     version: 8686a460bd2fbd2fb4dd805bacd70a40092784a128079411757dc85367e50aba
     blobstore_id: 1bd7f783-efa4-4559-53e6-d494cb9bf7c1
     sha1: sha256:b80349e3f6109731e257081324a3197278b21d2a39cd3afdd37b1107ff99d120
+  87bcdf88e7982f97781f984f6903326acd55bd6c550d608d4440781d11338294:
+    version: 87bcdf88e7982f97781f984f6903326acd55bd6c550d608d4440781d11338294
+    blobstore_id: c3733bfe-ff80-4c4e-5dd8-ed2820be0947
+    sha1: sha256:8a42f305f0d1120ea5423391950e25fba54967b4f66b3e825b90e1c04ebd1af8
   88011980700b9c3969dacd12797d3dbfb3f7e22d2b44658d0bbd434b8b00799b:
     version: 88011980700b9c3969dacd12797d3dbfb3f7e22d2b44658d0bbd434b8b00799b
     blobstore_id: bcfe2103-2457-4a4e-5877-dfcac8b10732

.final_builds/packages/metricsforwarder/index.yml

@@ -47,6 +47,10 @@ builds:
     version: 31019f3894b202912cfd406e8132176082bcb1171752043605ee8474655f8365
     blobstore_id: b9d1f21c-041a-41da-6905-f66f6d7fadb2
     sha1: sha256:7ae55fd81952298e1062fc9a10c834400b1b62c2ad5c0353db66b3e6dbd44334
+  3b355085674fde1943ae296e89261eceec63791f10ab593e52a54848454e3dae:
+    version: 3b355085674fde1943ae296e89261eceec63791f10ab593e52a54848454e3dae
+    blobstore_id: f3ca321d-28a0-4d65-6f9f-1a5090de83a6
+    sha1: sha256:b1086989647f4f590b3e6bd53158def58087e1cd752229048695cb0c497ec0a9
   3e594f58ed1be83749be080d1b17772121c50958df6bf51f7d15e8f3f216b1f9:
     version: 3e594f58ed1be83749be080d1b17772121c50958df6bf51f7d15e8f3f216b1f9
     blobstore_id: 71bbd498-565b-4f23-5679-9dc9cda3a3e0

.final_builds/packages/metricsgateway/index.yml

@@ -135,6 +135,10 @@ builds:
     version: 825154c588ee8f5daaf472d6415e3e794c9ccb45788471ac29fd93a58f37f2f2
     blobstore_id: 8ee90c58-8a02-410c-5f93-eade53aebfd9
     sha1: sha256:d28605ccbc087c2e0dd8367ca406463d6a8cafccd0df1f4eb331564dd8df5586
+  830e2c11ab6849860bc55bc4fad014e48f5a6e517aaaebb191a059ca8d5358dd:
+    version: 830e2c11ab6849860bc55bc4fad014e48f5a6e517aaaebb191a059ca8d5358dd
+    blobstore_id: 56cdafcc-c827-441a-78f9-d58a0f04a29b
+    sha1: sha256:1d2e9d55e888978330f3e4ce3874ff1ebaeb5b26559cb719b7d73b3c8598adbe
   84839c74e0434530a57a90611c21a6e19968f89542dd08516ee9c2ef3312820e:
     version: 84839c74e0434530a57a90611c21a6e19968f89542dd08516ee9c2ef3312820e
     blobstore_id: cf82490f-de16-44bf-64ea-8781b08786f7

.final_builds/packages/metricsserver/index.yml

@@ -203,6 +203,10 @@ builds:
     version: d76798a408168654b0be0d603a12415f8c94d4dea7db3eb33e016b1ef4814b94
     blobstore_id: e032b92c-a59b-4393-4b86-2fde7aef2832
     sha1: sha256:dc12719290ef09ba12dda666c4dcf7062cedd68fd910145bebef61e73889b640
+  dbbe1754a053e3563af6c55fcdc18707442a2021088f7ce041090f2d1fbd623c:
+    version: dbbe1754a053e3563af6c55fcdc18707442a2021088f7ce041090f2d1fbd623c
+    blobstore_id: 04b9ee98-67cb-4732-6019-4f5e982e9315
+    sha1: sha256:fd95a4c1f18e9a4d4fdb63f7390d5fac35636eb1c851ce0616324cb6d439a7d1
   dbd20f8ec0f085cc6fbd7f5a04494042336e470346c5d7305f9851def1421b51:
     version: dbd20f8ec0f085cc6fbd7f5a04494042336e470346c5d7305f9851def1421b51
     blobstore_id: 52f5d202-7673-422b-65f7-a5b46f4f0bf0

.final_builds/packages/operator/index.yml

@@ -163,6 +163,10 @@ builds:
     version: b0ea4349245bc12c2e066e3efb4b8e51237c3b0a31ea9bd883af50c1e0d568da
     blobstore_id: 92dee705-47d9-499e-6606-c450f1b99715
     sha1: sha256:4cffdbc32fec3088c9323acda89640375f7815418babedda9708d2dad84d5b4d
+  b0fb1d2c0572c3e3faf5395f01101e9c1642f5136c81c65582ef6ea45b22bf32:
+    version: b0fb1d2c0572c3e3faf5395f01101e9c1642f5136c81c65582ef6ea45b22bf32
+    blobstore_id: b9f13782-1709-44c8-7bbe-dd5a156260e6
+    sha1: sha256:71fc6168419c250cc4206cae7071b62b8d25e16d3e7cab0d4b67aeea01bc25e5
   b3fe7a3f46a9cd0a3d1d61294494b5c902415b572713efb3f545488003655362:
     version: b3fe7a3f46a9cd0a3d1d61294494b5c902415b572713efb3f545488003655362
     blobstore_id: 0a5bf0a6-e03d-4b53-6b7f-19f7921b6d9b

.final_builds/packages/scalingengine/index.yml

@@ -27,6 +27,10 @@ builds:
     version: 1e7a1655bc65bfdd3a07d7ce447e3d301e9692729e716a46e2cea27ef7ccf27b
     blobstore_id: b5d912b0-8a3e-445a-48c1-e4096ab976ad
     sha1: sha256:c348a7da3035febb24cc455b5c9f215909233c8e541794f9e582f24a24fea496
+  20eb0ac02d5c098f2844e8475dacf808bcbfa7daac3457e09bfcde134ac49076:
+    version: 20eb0ac02d5c098f2844e8475dacf808bcbfa7daac3457e09bfcde134ac49076
+    blobstore_id: 8a6175fd-785f-4b7e-7465-20ae4a71adae
+    sha1: sha256:21ce2351a97a9dd1e202432c2d62234f04d67934f9b76676a46f083e7cf701d4
   243b02a37ff82c851ca8d630b7738782281c1abef489caf45b0a4fe29ed1e34a:
     version: 243b02a37ff82c851ca8d630b7738782281c1abef489caf45b0a4fe29ed1e34a
     blobstore_id: d330133e-950c-4d90-4e74-2b9d00955322

.final_builds/packages/scheduler/index.yml

@@ -255,6 +255,10 @@ builds:
     version: b8dfd36745c1beb44612805c1582edea3e5e92f426d8f024fc073df1d4394a0f
     blobstore_id: c6d194a3-b521-4d93-7ccd-3d7d8e58b062
     sha1: sha256:92c0fb5acb4bc3453527d174664d13e7ef571747f6dc727c3895f98c84329f81
+  c46b06f4ceadbdccaf9064ebcaaade60e41f58b0f1355099d599c2d1e7bed038:
+    version: c46b06f4ceadbdccaf9064ebcaaade60e41f58b0f1355099d599c2d1e7bed038
+    blobstore_id: cb0d9172-c4e2-4fb2-6627-f9ceab24d93f
+    sha1: sha256:6c9275d71ebc5f5a9102f0099045c2b71dbeaf6fa3a873f1650ea630094a78b3
   c528642f9918d7f39f3e612acc8719d56327fa1ca99e63bb7a5156acd1a9e8e7:
     version: c528642f9918d7f39f3e612acc8719d56327fa1ca99e63bb7a5156acd1a9e8e7
     blobstore_id: e99be81d-4a3b-4ec7-564a-842b0fae92f3

jobs/golangapiserver/spec

@@ -92,7 +92,7 @@ properties:
     default: "Autoscaler"
   autoscaler.apiserver.info.build:
     description: "Autoscaler application build number"
-    default: "13.1.0"
+    default: "13.1.1"
   autoscaler.apiserver.info.support_url:
     description: "Autoscaler application support page URL"
     default: "https://github.com/cloudfoundry/app-autoscaler-release"

releases/app-autoscaler/app-autoscaler-13.1.1.yml

@@ -0,0 +1,163 @@
+name: app-autoscaler
+version: 13.1.1
+commit_hash: 49b7cb9f1
+uncommitted_changes: false
+jobs:
+- name: eventgenerator
+  version: 292a7e23aaaeabdf009f1aa735e7ab98517faecdaadf387a8309832c8404deda
+  fingerprint: 292a7e23aaaeabdf009f1aa735e7ab98517faecdaadf387a8309832c8404deda
+  sha1: sha256:a55c01ef25e26d61a43fc7cd035ac13156520db3da4e510f527ac2be67767953
+  packages:
+  - openjdk-17
+  - db
+  - eventgenerator
+  - common
+  - changeloglockcleaner
+- name: golangapiserver
+  version: 126748a518253b6f5394a2dedfa1b0d37620f8453f2c90304e8dc76ef6206629
+  fingerprint: 126748a518253b6f5394a2dedfa1b0d37620f8453f2c90304e8dc76ef6206629
+  sha1: sha256:3497a7cf0ba9c57ab4ad268884d3b6bf638d92ed540250c7bdfb96bb5b9664a9
+  packages:
+  - golang-1-linux
+  - golangapiserver
+  - db
+  - openjdk-17
+  - common
+  - changeloglockcleaner
+- name: metricsforwarder
+  version: 8af6f7ef09c0f11be0bd4972f0ca2b9074a8eb8b5045ad7aca43cf4b177152d6
+  fingerprint: 8af6f7ef09c0f11be0bd4972f0ca2b9074a8eb8b5045ad7aca43cf4b177152d6
+  sha1: sha256:6d857a2ddd988cbee9c1870b1d2f2b3f331916576f38371f445d04124e9ac0e8
+  packages:
+  - db
+  - metricsforwarder
+  - common
+- name: metricsgateway
+  version: 6b2fd6c39c12b3ce1b774a4f3eb634939347df02d4921b1a374bca027dae112c
+  fingerprint: 6b2fd6c39c12b3ce1b774a4f3eb634939347df02d4921b1a374bca027dae112c
+  sha1: sha256:83f07a5b73bd18a48bce412b258e0361a87bc5a1db6975a04166850a11dfd588
+  packages:
+  - openjdk-17
+  - db
+  - metricsgateway
+  - common
+- name: metricsserver
+  version: fb43940973167724049f2524b3e35f93eba92f576fb7c4665db1b309b6944b25
+  fingerprint: fb43940973167724049f2524b3e35f93eba92f576fb7c4665db1b309b6944b25
+  sha1: sha256:de4dfcbfe7f28689377ee83f74886d76f7014dbd677f1bca02267fcc58d59572
+  packages:
+  - openjdk-17
+  - db
+  - metricsserver
+  - common
+  - changeloglockcleaner
+- name: operator
+  version: 11ffdb19acd96f1099e42bdce522013ee7440519f746be68d99d7b1c37581375
+  fingerprint: 11ffdb19acd96f1099e42bdce522013ee7440519f746be68d99d7b1c37581375
+  sha1: sha256:3502913539aebf8f2e0b3a117ca5dc10c69bb87ead1d4939d538e1c869361bc1
+  packages:
+  - operator
+  - common
+  - db
+  - openjdk-17
+  - changeloglockcleaner
+- name: scalingengine
+  version: fbd7ee3f304cf1ac2ec8fdc10e67f003d50d949ab25a58df838f0497ac503f5f
+  fingerprint: fbd7ee3f304cf1ac2ec8fdc10e67f003d50d949ab25a58df838f0497ac503f5f
+  sha1: sha256:d55638d6a6f8ebc26ea9fd29a5aa3dd83db59be9aa3f0fad2a4d3dda3721941f
+  packages:
+  - openjdk-17
+  - db
+  - scalingengine
+  - common
+  - changeloglockcleaner
+- name: scheduler
+  version: 81741f07889700443355701c5afdaa04c492acf69d5f89b94dc32b4b997bc288
+  fingerprint: 81741f07889700443355701c5afdaa04c492acf69d5f89b94dc32b4b997bc288
+  sha1: sha256:57067b1b7c6884b17db77bc691cce8de2a71db5ca5076d619d158a9be608e514
+  packages:
+  - scheduler
+  - db
+  - openjdk-17
+  - common
+  - changeloglockcleaner
+packages:
+- name: changeloglockcleaner
+  version: 2ddb536c506af45ecb6e0db40e8295fe526ff9c104414a5798f644d36435799c
+  fingerprint: 2ddb536c506af45ecb6e0db40e8295fe526ff9c104414a5798f644d36435799c
+  sha1: sha256:f614d088068de143e7431671c107b92a0db33124ebe6cc49bcf25c78c4e135d3
+  dependencies:
+  - golang-1-linux
+- name: common
+  version: 9d7726aa454227e3087cd4a04425acae72d883a5bb19d314930ab58e83f04d0e
+  fingerprint: 9d7726aa454227e3087cd4a04425acae72d883a5bb19d314930ab58e83f04d0e
+  sha1: sha256:979ff40c6e44031bec55344aa4a522cac3d265ab23deaea0f7bc7541aa2b4124
+  dependencies: []
+- name: db
+  version: fbc5555ce279e0a7c4c234b63f3e61ede2a20f2f495cdbbda0885bb704c2a6fc
+  fingerprint: fbc5555ce279e0a7c4c234b63f3e61ede2a20f2f495cdbbda0885bb704c2a6fc
+  sha1: sha256:1dabb884780be9cbb301f861cb10c9d9a9e815a25ec0b62e89d148bd9be1db7c
+  dependencies:
+  - openjdk-17
+- name: eventgenerator
+  version: 7cf0b89b2313f2c90f4f59ed25488b9fdec088063429532fcdcfcbba9f43b4b1
+  fingerprint: 7cf0b89b2313f2c90f4f59ed25488b9fdec088063429532fcdcfcbba9f43b4b1
+  sha1: sha256:2788d9c4be61559636c144f53dfac8ba700fe2cb3a3c4cd4f162a63b89ff2583
+  dependencies:
+  - golang-1-linux
+- name: golang-1-linux
+  version: a53d60ed79d278964faa9bc17836ed3bc5f084c0f3d41110c8a6e0b2de5f2dc0
+  fingerprint: a53d60ed79d278964faa9bc17836ed3bc5f084c0f3d41110c8a6e0b2de5f2dc0
+  sha1: sha256:7e0fc0e87c06d8aabcb0f84c83fa15fb8f0565e60afbb7f0236050412cb8628e
+  dependencies: []
+- name: golangapiserver
+  version: 87bcdf88e7982f97781f984f6903326acd55bd6c550d608d4440781d11338294
+  fingerprint: 87bcdf88e7982f97781f984f6903326acd55bd6c550d608d4440781d11338294
+  sha1: sha256:8a42f305f0d1120ea5423391950e25fba54967b4f66b3e825b90e1c04ebd1af8
+  dependencies:
+  - golang-1-linux
+- name: metricsforwarder
+  version: 3b355085674fde1943ae296e89261eceec63791f10ab593e52a54848454e3dae
+  fingerprint: 3b355085674fde1943ae296e89261eceec63791f10ab593e52a54848454e3dae
+  sha1: sha256:b1086989647f4f590b3e6bd53158def58087e1cd752229048695cb0c497ec0a9
+  dependencies:
+  - golang-1-linux
+- name: metricsgateway
+  version: 830e2c11ab6849860bc55bc4fad014e48f5a6e517aaaebb191a059ca8d5358dd
+  fingerprint: 830e2c11ab6849860bc55bc4fad014e48f5a6e517aaaebb191a059ca8d5358dd
+  sha1: sha256:1d2e9d55e888978330f3e4ce3874ff1ebaeb5b26559cb719b7d73b3c8598adbe
+  dependencies:
+  - golang-1-linux
+- name: metricsserver
+  version: dbbe1754a053e3563af6c55fcdc18707442a2021088f7ce041090f2d1fbd623c
+  fingerprint: dbbe1754a053e3563af6c55fcdc18707442a2021088f7ce041090f2d1fbd623c
+  sha1: sha256:fd95a4c1f18e9a4d4fdb63f7390d5fac35636eb1c851ce0616324cb6d439a7d1
+  dependencies:
+  - golang-1-linux
+- name: openjdk-17
+  version: be13f95495365f8879a75d9237320cd587774f6cbc087020bd6508fb8a82184a
+  fingerprint: be13f95495365f8879a75d9237320cd587774f6cbc087020bd6508fb8a82184a
+  sha1: sha256:99e2ef396973d7bbbfddffad6968b419627c20bb426117f8c3115cad5b206227
+  dependencies: []
+- name: operator
+  version: b0fb1d2c0572c3e3faf5395f01101e9c1642f5136c81c65582ef6ea45b22bf32
+  fingerprint: b0fb1d2c0572c3e3faf5395f01101e9c1642f5136c81c65582ef6ea45b22bf32
+  sha1: sha256:71fc6168419c250cc4206cae7071b62b8d25e16d3e7cab0d4b67aeea01bc25e5
+  dependencies:
+  - golang-1-linux
+- name: scalingengine
+  version: 20eb0ac02d5c098f2844e8475dacf808bcbfa7daac3457e09bfcde134ac49076
+  fingerprint: 20eb0ac02d5c098f2844e8475dacf808bcbfa7daac3457e09bfcde134ac49076
+  sha1: sha256:21ce2351a97a9dd1e202432c2d62234f04d67934f9b76676a46f083e7cf701d4
+  dependencies:
+  - golang-1-linux
+- name: scheduler
+  version: c46b06f4ceadbdccaf9064ebcaaade60e41f58b0f1355099d599c2d1e7bed038
+  fingerprint: c46b06f4ceadbdccaf9064ebcaaade60e41f58b0f1355099d599c2d1e7bed038
+  sha1: sha256:6c9275d71ebc5f5a9102f0099045c2b71dbeaf6fa3a873f1650ea630094a78b3
+  dependencies:
+  - openjdk-17
+license:
+  version: 15eb386a0db48f190d29bd28058f5d0d6605f5acde7c6cfc6f014d57747e41f9
+  fingerprint: 15eb386a0db48f190d29bd28058f5d0d6605f5acde7c6cfc6f014d57747e41f9
+  sha1: sha256:6c7a834097b96efc340787fbe5876c1e366de0235def5e2b93fa016c8655535c

releases/app-autoscaler/index.yml

@@ -97,6 +97,8 @@ builds:
     version: 9.2.0
   a69ee1ec-4773-465d-7801-e97c60d908fe:
     version: 3.7.7
+  b06f15a9-a0d9-4ac1-7721-47fa0e701e9d:
+    version: 13.1.1
   b2231836-a048-42b2-4b41-d6a8f712e68b:
     version: 3.4.1
   b4370281-0b53-4e8b-749b-547d3dedbfbc:

src/acceptance/app/cf_metadata_test.go

@@ -1,7 +1,6 @@
 package app_test
 
 import (
-	"acceptance"
 	. "acceptance/helpers"
 	"time"
 
@@ -24,26 +23,15 @@ var _ = Describe("AutoScaler CF metadata support", func() {
 	})
 	AfterEach(AppAfterEach)
 
-	Context("when scaling by custom metrics", func() {
-		It("should scale out normally", Label(acceptance.LabelSmokeTests), func() {
-			By("Scale out to 2 instances")
+	When("the label app-autoscaler.cloudfoundry.org/disable-autoscaling is set", func() {
+		It("should not scale out", func() {
+			By("Set the label app-autoscaler.cloudfoundry.org/disable-autoscaling to true")
+			SetLabel(cfg, appGUID, "app-autoscaler.cloudfoundry.org/disable-autoscaling", "true")
 			scaleOut := sendMetricToAutoscaler(cfg, appGUID, appName, 550, true)
-			Eventually(scaleOut).
+			Consistently(scaleOut).
 				WithTimeout(5 * time.Minute).
 				WithPolling(15 * time.Second).
-				Should(Equal(2))
-		})
-
-		Context("when the label app-autoscaler.cloudfoundry.org/disable-autoscaling is set", func() {
-			It("should not scale out", Label(acceptance.LabelSmokeTests), func() {
-				By("Set the label app-autoscaler.cloudfoundry.org/disable-autoscaling to true")
-				SetLabel(cfg, appGUID, "app-autoscaler.cloudfoundry.org/disable-autoscaling", "true")
-				scaleOut := sendMetricToAutoscaler(cfg, appGUID, appName, 550, true)
-				Consistently(scaleOut).
-					WithTimeout(5 * time.Minute).
-					WithPolling(15 * time.Second).
-					Should(Equal(1))
-			})
+				Should(Equal(1))
 		})
 	})
 })