Merge branch 'main' into 754-publicapi-in-cf

.editorconfig

@@ -22,3 +22,7 @@ eclint_indent_style = unset
 [Dockerfile]
 indent_size = 4
 indent_style = tab
+
+[{*.bash,*.sh}]
+indent_size = 2
+indent_style = tab

.final_builds/jobs/golangapiserver/index.yml

@@ -255,6 +255,10 @@ builds:
     version: ab6d15668d08064e52f05255e4c7b749e63c43c8d19971985af202b94356c60c
     blobstore_id: 5ba3902e-2fab-401c-7545-c61d0ecd06db
     sha1: sha256:932e13062b62d84e1382225b60049668b20df80fa3fd0c9c1cd67ea727e88d11
+  ac03e1364a6587e95c5df21e8c08dae60e0004a0e6ae58503c4b4b9326a3bb1b:
+    version: ac03e1364a6587e95c5df21e8c08dae60e0004a0e6ae58503c4b4b9326a3bb1b
+    blobstore_id: 5f5dde1d-5b26-44c7-6063-7faab9b9e0f3
+    sha1: sha256:6a84e0fd27771a47efb664ae65ee178265cfa0a2f5f7a05977a371f828015bf7
   aec8517a91e5943bb6106cb49ae24ee805628fa3a65df21822e05e0e7b569823:
     version: aec8517a91e5943bb6106cb49ae24ee805628fa3a65df21822e05e0e7b569823
     blobstore_id: face2554-889e-4cc1-46c3-4de755f82f02
@@ -279,6 +283,10 @@ builds:
     version: c1d235c0230529d245ca81839a6811f6ccf28bb045d623a6392adbeeac6d0942
     blobstore_id: 27a3427a-5404-46ef-6ce5-2bfd9e055af1
     sha1: sha256:a6f04020f19aaf0c39c52f6df9d8dc2b922f705d2ea0ac71bc7bb184c6933c1b
+  c46138fadcc1963a57901355c07c1f8fabc389ad8ba9e7b9c373366de45e8725:
+    version: c46138fadcc1963a57901355c07c1f8fabc389ad8ba9e7b9c373366de45e8725
+    blobstore_id: fb546dff-89c5-4aa9-52fd-7ce0449a9ace
+    sha1: sha256:f9c360dcafed1a12d384f2ba7fdd62412f6b8558e3ed678ee04b7794ce90f7e1
   cb71f07770fba86865d95b800cb00324681caaba93a11ceae736318e7b5766e7:
     version: cb71f07770fba86865d95b800cb00324681caaba93a11ceae736318e7b5766e7
     blobstore_id: 7ec8b4b8-d95a-4569-42e4-b5c54682c66e

.final_builds/jobs/scheduler/index.yml

@@ -59,6 +59,10 @@ builds:
     version: c9031f3f43f37bf3c7fbd4cc99817e36d408bbef57d54f62a85562a8ad74222e
     blobstore_id: 6f1dca00-4f4e-4608-5ad1-f09d07255519
     sha1: sha256:61ec8ebae8d587bd2a7fd7141818a133c038ca2cb38851aedba9fe2a7a405075
+  cd47519d240c51ef89599e59add893005e267d592159fb4d91b17232b04f9ef2:
+    version: cd47519d240c51ef89599e59add893005e267d592159fb4d91b17232b04f9ef2
+    blobstore_id: 6522180e-ae67-48fe-7c5b-fcb395dae48c
+    sha1: sha256:eb99adf1008d3a57b1c6dff091a2b8f9382d697fc10e51868f3e6a0b97c7690c
   cdee01a7f802319ccf8d411ea0856f696b196a6c2d2fc3beb503d813b1a297f8:
     version: cdee01a7f802319ccf8d411ea0856f696b196a6c2d2fc3beb503d813b1a297f8
     blobstore_id: 11f4783c-a5cf-48c5-7bb2-8153d76dc4fd

.final_builds/packages/changeloglockcleaner/index.yml

@@ -119,6 +119,10 @@ builds:
     version: a2394575bd86487137f8bac79d068aa7e19311d1aef3df7fdedfcfbb96e96345
     blobstore_id: 37615031-dc38-4fa1-4eea-fc989190d73e
     sha1: sha256:575b881f3ab29576273b5ffa63726f0aaa040cec3e07809c59044cc2225e2ee5
+  a3cf8b846a94d6786f25644d6d922ec7b77baf06fd560df62b25a0637d6c9748:
+    version: a3cf8b846a94d6786f25644d6d922ec7b77baf06fd560df62b25a0637d6c9748
+    blobstore_id: 454389b3-93cb-46a3-7ec6-4447d2eba8d4
+    sha1: sha256:a54307b26c324046bb51ece37bab9c3098fa7714d2c3f1e22d21e40230e057f8
   a62b1a176d05489bc08e98e74e050efdd65bac35644201c3b02d9a85288f70f8:
     version: a62b1a176d05489bc08e98e74e050efdd65bac35644201c3b02d9a85288f70f8
     blobstore_id: 22e83bab-f0b5-4d93-75c4-558ad60eac86
@@ -159,6 +163,10 @@ builds:
     version: d069e923efe736da37170a21646803e683659d29bb14433ebc54cb42133280c5
     blobstore_id: 67d798c1-4ac7-405d-4182-fab2f31eff66
     sha1: sha256:39f11a18964dd6bd888a308c67c0195727f2039a38d34fadb504dcae9a2dcfe3
+  d0b639116af0db84535531686e122e76f0a5ae8d8e6892eab541b99067541c77:
+    version: d0b639116af0db84535531686e122e76f0a5ae8d8e6892eab541b99067541c77
+    blobstore_id: e09fa7a6-9ae9-4232-5bb8-203d878d1083
+    sha1: sha256:4cc0550b00b712311f31d7b10f11133e0b7a072c3e4b85c389dc350dd923e9c0
   d1782cc845a0db71aacfa10cf98826be06de7440bfef896adcc0128e4c6ae270:
     version: d1782cc845a0db71aacfa10cf98826be06de7440bfef896adcc0128e4c6ae270
     blobstore_id: 37790227-518e-4866-699a-c8335afbc58b

.final_builds/packages/db/index.yml

@@ -119,6 +119,10 @@ builds:
     version: 887e8b0609ffb6ce8b34b153acd131792b86683a754aa1a4cf4d17ca1e898300
     blobstore_id: 12bdb02d-eca9-4a1c-6b75-cc20348f31ed
     sha1: sha256:cd2ceda8a2ef45a1d4362c329f507d3868923be2d179866c6eef23516bb1dc70
+  8b1147ba82db7a04e021a2cf409f3a36e924ae0ca36111eb2fe66da65e258307:
+    version: 8b1147ba82db7a04e021a2cf409f3a36e924ae0ca36111eb2fe66da65e258307
+    blobstore_id: c3a59ff4-7b01-4190-66cb-d0f0c3c69491
+    sha1: sha256:cc5dfd4600427a9ce14cfcbf7b98e1936fb1c57ff971cdab17e0d28d84376608
   8c09cc74959b573a02d39b894c5df6afe600f4503b31d8dafdb07298e8d8310e:
     version: 8c09cc74959b573a02d39b894c5df6afe600f4503b31d8dafdb07298e8d8310e
     blobstore_id: 770d7ed9-af65-4967-53c8-1161751c2320
@@ -251,6 +255,10 @@ builds:
     version: c4afabf48b6d089dcb250e5df7d3ad50176c904a4175bc6012023ac288a7b51f
     blobstore_id: 5f604634-21c1-499c-6c02-be3a5ec85258
     sha1: sha256:7739ceb0c6c58988a7f5c44f7c35acc25241ecbe3cf05a9a8cd88de102f35ae5
+  c4dc0df1506bfb697deaa972f2f52e02984b516058cac1e13a1e3165a76e5c83:
+    version: c4dc0df1506bfb697deaa972f2f52e02984b516058cac1e13a1e3165a76e5c83
+    blobstore_id: e4fbd8e1-4154-4a57-6a7e-09b2645cbc79
+    sha1: sha256:89da1d6965b71de28a46684e64ef9d050dd6f6238f7be684c35dacc81aa96dd0
   c9ddf1bc3a85d12ccb42f332405296898fe536cd81a82d28626ef70b0e823f2d:
     version: c9ddf1bc3a85d12ccb42f332405296898fe536cd81a82d28626ef70b0e823f2d
     blobstore_id: 799ac156-0942-4ec4-4b9c-836e7e568c66

.final_builds/packages/eventgenerator/index.yml

@@ -227,6 +227,10 @@ builds:
     version: ddf197e77d5ba2a7a7fe2e2c895b7aadede4073dd38f2282c144d2971f07bc96
     blobstore_id: 19dccddb-989c-4312-6c29-1961986c0459
     sha1: sha256:b87b22cbf0dfff889f113e57182b63e6000eb9433870292a4dc3825ca1072165
+  deb6d894be9c14a43c4621639baaa19e9698281ea8f76d4fc257026175dcc537:
+    version: deb6d894be9c14a43c4621639baaa19e9698281ea8f76d4fc257026175dcc537
+    blobstore_id: e867abf1-2449-493d-4837-f7419c602cfc
+    sha1: sha256:04cbc7e90428111c4abd45816303fcecc422b76faab518f88b9fec9802e66318
   e52704916a1fedef316602e914932179f98ef64b396cb1a33afd3def43693715:
     version: e52704916a1fedef316602e914932179f98ef64b396cb1a33afd3def43693715
     blobstore_id: 9524b1ef-b155-4db4-7ad3-1c5a946cf5a3
@@ -251,6 +255,10 @@ builds:
     version: f0579964c07b2d396e1129fd593a610596fd9bd07d0700654ecd22c8b5d32221
     blobstore_id: 51c82e83-9661-43c6-6941-4af83846a5f4
     sha1: sha256:e5a49a8ccae1ac18899fcb412e12f3c0584e211fd86f873b9790f42601ba5935
+  f3057c4e83e410934368ac4cc6267cc0ae724e1f9ad26a1392c0393b2bf6b683:
+    version: f3057c4e83e410934368ac4cc6267cc0ae724e1f9ad26a1392c0393b2bf6b683
+    blobstore_id: 2ef4cf44-f4d9-428b-7e24-3f92d5ea2e6e
+    sha1: sha256:c0488ee8e69016cfbbdda4b1e7b15af8f8bba349cf36a5d4453b7cf215bafbec
   f556306b400b47708e8e9267d1a5282669b911827e8600122d2fc99a36ca4fe2:
     version: f556306b400b47708e8e9267d1a5282669b911827e8600122d2fc99a36ca4fe2
     blobstore_id: 14e117ba-5103-4a87-493c-f5251b6ba7b9

.final_builds/packages/golang-1-linux/index.yml

@@ -1,4 +1,8 @@
 builds:
+  04370ac17a8829676ddf8a96b55c043d5a94c326c177940a807ca7d59cb55fc7:
+    version: 04370ac17a8829676ddf8a96b55c043d5a94c326c177940a807ca7d59cb55fc7
+    blobstore_id: 844c2384-48e9-45ff-7089-2ccf7b6a7865
+    sha1: sha256:863dbca9da0a90ea6dfc40aa147de28dd87a50d3f214204093f297a33c05d5f3
   0c0b240b0e0e86983661fbdbef9e688db3951f97db4a7f89ba5ddb1d43461715:
     version: 0c0b240b0e0e86983661fbdbef9e688db3951f97db4a7f89ba5ddb1d43461715
     blobstore_id: ba9e86f9-3bde-4cbf-6dc7-64468bebf1ed

.final_builds/packages/golangapiserver/index.yml

@@ -7,6 +7,10 @@ builds:
     version: 0c5e23ae94504bc03a18d4583be01b7e998c06b3bd993a1bc44e8e8b5b6091e7
     blobstore_id: 8739f362-8515-4a6b-7cc3-11a326790a4c
     sha1: sha256:8adebb646263dae1deb658ff6e43795f628fd9c4c187d61d97b71b81b5910d3f
+  0da38275ba9e394dfbd057f65dcda2104dde158eafd2a8e695872cd089202ee6:
+    version: 0da38275ba9e394dfbd057f65dcda2104dde158eafd2a8e695872cd089202ee6
+    blobstore_id: b7c614af-bbad-4012-69fe-14d7e90c4d3b
+    sha1: sha256:8a4820692c58a9976ccdc88803f2cc20407c96713f685ad0f39992d2ffa9bc67
   187b48476389d4ba3dfe00237a1d0a5117e5c41835f652efe46921be387b8218:
     version: 187b48476389d4ba3dfe00237a1d0a5117e5c41835f652efe46921be387b8218
     blobstore_id: 4990dc2d-f39a-4a8a-632e-07f19833f096
@@ -235,6 +239,10 @@ builds:
     version: d9a6688ba022911da14292478cf27c4d065b64d5dd9a81aba104ac58b781a795
     blobstore_id: 81bfcead-0f91-4063-4f72-36a63fd2c5ab
     sha1: sha256:b70fc5d0536606fb4faad3bc30b34e13d9bb0e7d5773c1246327238229e3b3ed
+  dc9769cce9b568dd649384649decf534b6a6de0a938a4ba92f85792b01bb201b:
+    version: dc9769cce9b568dd649384649decf534b6a6de0a938a4ba92f85792b01bb201b
+    blobstore_id: 95d47397-168c-4052-4eb0-0d3ec58a0ca2
+    sha1: sha256:00cd2e871a9c1fe2cde76f774a759d7e9419d43aea00f9d3d316396fbc45279e
   dde9eb871529d07e811ef9dcfdf2bb8e1ebec2157aa13d77699540f10236e3e3:
     version: dde9eb871529d07e811ef9dcfdf2bb8e1ebec2157aa13d77699540f10236e3e3
     blobstore_id: 72a16154-da10-4dc1-6df4-443e2c6ea9eb

.final_builds/packages/metricsforwarder/index.yml

@@ -151,6 +151,10 @@ builds:
     version: 90f1e81596099b56867ee5fbaecc7017340d8e96b600295fdf0e5435ae8f8415
     blobstore_id: d6400d9e-ac27-4889-5e16-9d29f380d100
     sha1: sha256:de9bc7020a79395fef2642343cda9b2527e78af76c30e3d4ee9b0b5c6e18f1ee
+  912a64e5211dd04b60274afa7dcd1bab7f4bac3b7e0d9ea8ea25ee4d553051b4:
+    version: 912a64e5211dd04b60274afa7dcd1bab7f4bac3b7e0d9ea8ea25ee4d553051b4
+    blobstore_id: 3c29b203-9f48-42f2-4df8-376c6c7ce229
+    sha1: sha256:4ed49f91e62a3ba8c6131f901532f0bc1aa7c958c701ce8bea04764c9fb50f83
   977e0a429954776326a4a923e913d1c21cfe82d10985be9f9b1225e4418619e0:
     version: 977e0a429954776326a4a923e913d1c21cfe82d10985be9f9b1225e4418619e0
     blobstore_id: 0268db6f-da8c-4283-520f-d1b601dbed93
@@ -207,6 +211,10 @@ builds:
     version: ca8b506fcea10dff481b130da2069a0a450608c0a3547ceef91f9d5e7abed0cb
     blobstore_id: fdd74477-e7ee-40fe-7b5c-19b537c2a32e
     sha1: sha256:1bbf48d6d4d047b28af31cc5c134359d2c3377cabcfa64b323a14377c36c2e50
+  cabd46d551bac87946b6f7ea8704d2f0ef00990624ec57fa094cbf57a5e867a6:
+    version: cabd46d551bac87946b6f7ea8704d2f0ef00990624ec57fa094cbf57a5e867a6
+    blobstore_id: a4a902f6-dd72-4ba6-6ed2-ede1fb111b3c
+    sha1: sha256:c68f50ffedc0cfa90118665a7efade2046ed2512ea07e01aba31460092460bc4
   cf9db3934a2e988eacc7e99ba9840e153cc8ba5aa2f40fb1f289b6d80ce98327:
     version: cf9db3934a2e988eacc7e99ba9840e153cc8ba5aa2f40fb1f289b6d80ce98327
     blobstore_id: e43bb31d-aed2-450e-5037-bd48c9559d67

.final_builds/packages/operator/index.yml

@@ -67,6 +67,10 @@ builds:
     version: 4b77cff680a7d9fc84ecf13a6262dc9720afbdb534d0ad2c3aaa081be788f631
     blobstore_id: b2c28cf2-99af-422b-78af-242bc6b6d94f
     sha1: sha256:d534c6415b3a2d31abfb64654f2feec6df36bc7b90a31f5b313b6bc55b78b944
+  4bb710db4e575de75629237bbe7788682e6e87e688f2059433e911bdc440356c:
+    version: 4bb710db4e575de75629237bbe7788682e6e87e688f2059433e911bdc440356c
+    blobstore_id: b20856af-5a47-4006-40e9-187bbe4d6686
+    sha1: sha256:8688146cf7a525e5ba6eba5179b6226c6e257c1d1e4dca8e849d11c4fc0f8baf
   4d95c85b947a460c49ba2fb397feb73fc4b7899999356bed2b178f77a231546d:
     version: 4d95c85b947a460c49ba2fb397feb73fc4b7899999356bed2b178f77a231546d
     blobstore_id: 9730820a-c375-42bf-745a-d2b606a9b8f5
@@ -115,6 +119,10 @@ builds:
     version: 848623069bcbe253b7638e8c01ab21fe2c71eab1e01e0c3d9d6b2e858ffd9a5f
     blobstore_id: 6c0e9217-a71b-4b49-7667-ac1f45aab395
     sha1: sha256:2138dde1cd7be93f3dc978653a030e72d7329681c4b05f253438ee8b1d7f48c1
+  849508b3af0875acfb590e366a45fecd784e6c6b070189699312407c12f18654:
+    version: 849508b3af0875acfb590e366a45fecd784e6c6b070189699312407c12f18654
+    blobstore_id: 7109c0d0-8c24-4de0-5578-dfe69d13f88c
+    sha1: sha256:1b53b87ad96cff6fd80d41825cfb404768540f02a6d2aa0be142f6eb74041f33
   84f1473f55a3b9806847d387dfdc1a3423aaa36f9be09c85ea07e842da9e7528:
     version: 84f1473f55a3b9806847d387dfdc1a3423aaa36f9be09c85ea07e842da9e7528
     blobstore_id: 2b150d31-d354-411a-7d9f-e17771426aab

.final_builds/packages/scalingengine/index.yml

@@ -79,6 +79,10 @@ builds:
     version: 4806a3f24a6dc2611e8c4f55ebbf34d773a801ea93deb268af507debd736c8ef
     blobstore_id: 65d23c1b-2431-4723-50c2-9eb1ac98d7e5
     sha1: sha256:c7a1714a794afd469a345d594934ea866ee074a313ff0351174d3194f0b957dd
+  4b49005fd0a616ad4a5978998412fd182ef9641535c44e9da796313f79715cbd:
+    version: 4b49005fd0a616ad4a5978998412fd182ef9641535c44e9da796313f79715cbd
+    blobstore_id: 9fe02b58-140b-4352-7ffb-c91213b80f03
+    sha1: sha256:5cd1816e3162cb6daa9012ce4543ae999109c60d9405b4385b271a780dace3e0
   4e5f17b7bc59d30caf8f5a84db225c910b725feb18f494002cd665818d2fd2fc:
     version: 4e5f17b7bc59d30caf8f5a84db225c910b725feb18f494002cd665818d2fd2fc
     blobstore_id: 1557c83c-c13c-495e-4890-05ccb27fe435
@@ -207,6 +211,10 @@ builds:
     version: c6db7092f2090a2de81acefe56154e6947d4bd158e4165990ed24597eb580ff1
     blobstore_id: f69f2c3e-c380-4d68-4149-2723fb517b0a
     sha1: sha256:7b7db975f93358247a30424854ef6a08d03e3ed6ea5468e7d1141c4ef0104402
+  c7b2963aa5d6a12a9a567cbc42817265e2563ec70cf9cbfbe80993cc20bf88a5:
+    version: c7b2963aa5d6a12a9a567cbc42817265e2563ec70cf9cbfbe80993cc20bf88a5
+    blobstore_id: 303562e1-8659-4fc7-4563-1dd790263cff
+    sha1: sha256:bb640ab4afeafafd76e1ef5c920b4747408c58818143a677ddcdaa1594f610fa
   cb5b7957c02ce982b174e59f5854ead014f7bf0f6b25a250fe321052656d0bf7:
     version: cb5b7957c02ce982b174e59f5854ead014f7bf0f6b25a250fe321052656d0bf7
     blobstore_id: 75fdd8ba-e056-4d2b-5b46-84d3512aefb3

.final_builds/packages/scheduler/index.yml

@@ -223,6 +223,10 @@ builds:
     version: 9a8d7376ffba5182d9f976030a6093304c836a5945b4461831adb7a5bea896ba
     blobstore_id: fcae72ce-a518-4a8c-7306-12d9730aec6a
     sha1: sha256:e10897c0d6070196920f265a03a27f3a8ccc852c2d269403e87fbcd0192479d9
+  9fa0c8b9f100a9f20143f52f5b783829205270ecccba12f623e7801a6a7c95a3:
+    version: 9fa0c8b9f100a9f20143f52f5b783829205270ecccba12f623e7801a6a7c95a3
+    blobstore_id: 0bca0db4-ad3c-4264-40cb-88674b51accd
+    sha1: sha256:49ecb19bd47efc3067e19baa4139db5b7290f8434761031ade91be2d8628b518
   a1dbd50bffeefd4bcb0f300aa537c0385a4bc6bf35193dd9c99ae28f9be07846:
     version: a1dbd50bffeefd4bcb0f300aa537c0385a4bc6bf35193dd9c99ae28f9be07846
     blobstore_id: b843cd63-a01a-4439-7d14-ece5eba7268b
@@ -299,6 +303,10 @@ builds:
     version: d5d8bb7a06ae56ace50890a5982c848518b4c2a4c858dc575ac64ecd0eb72054
     blobstore_id: 0701e803-115d-4cf6-45cd-9b74d0e82d17
     sha1: sha256:e315ae4956d203faea3dd671ef6dbfc17862853c19fca6dcdb24ad2b1a36ca13
+  d8001bbbb4bd05e8ec03346a7c8f3a9d0f11243028137eb039bd47779c84cce9:
+    version: d8001bbbb4bd05e8ec03346a7c8f3a9d0f11243028137eb039bd47779c84cce9
+    blobstore_id: 884c68cb-323f-4f91-766b-8d3ff3743ed7
+    sha1: sha256:24241ce62336d2eba0af036de4e8d9171192d14c628d257a4d62568437a418b2
   d9edd0c600c0db31d50afed56e05f1c7aaa32cb8273216ad19c7168985bfe2ab:
     version: d9edd0c600c0db31d50afed56e05f1c7aaa32cb8273216ad19c7168985bfe2ab
     blobstore_id: d39b145a-8987-4c76-58d7-4baef700ed4f

.github/workflows/asdf2devbox.yaml

@@ -4,6 +4,8 @@ on:
   pull_request:
     paths:
       - ".tool-versions"
+      - "scripts/asdf2devbox.py"
+      - ".github/workflows/asdf2devbox.yaml"
 jobs:
   asdf2devbox:
     runs-on: ubuntu-latest

.github/workflows/scorecard.yml

@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
         with:
           name: SARIF file
           path: results.sarif

.golangci.yaml

@@ -113,7 +113,7 @@ linters:
     - testpackage
     - typecheck
       #    - unconvert
-      #    - unparam
+      # - unparam
     - unused
     - whitespace
       #    - godox

.tool-versions

@@ -6,8 +6,8 @@ cf 8.7.11
 concourse 7.10.0
 direnv 2.34.0
 gcloud 473.0.0
-ginkgo 2.19.0
-golang 1.22.1
+ginkgo 2.20.0
+golang 1.22.2
 golangci-lint 1.59.1
 java temurin-21.0.3+9.0.LTS
 make 4.4

Makefile

@@ -80,13 +80,13 @@ clean-scheduler:
 clean-certs:
 	@echo " - cleaning test certs"
 	@rm -f test-certs/*
+	@rm --force --recursive src/scheduler/src/test/resources/certs
 clean-bosh-release:
 	@echo " - cleaning bosh dev releases"
 	@rm -rf dev_releases
 	@rm -rf .dev_builds
 clean-acceptance:
-	@echo " - cleaning acceptance"
-	@rm src/acceptance/acceptance_config.json &> /dev/null || true
+	@echo ' - cleaning acceptance (⚠️ This keeps the file “src/acceptance/acceptance_config.json” if present!)'
 	@rm src/acceptance/ginkgo* &> /dev/null || true
 	@rm -rf src/acceptance/results &> /dev/null || true
 
@@ -115,22 +115,21 @@ $(addprefix test_,$(go_modules)):
 
 
 .PHONY: test-certs
-test-certs: target/autoscaler_test_certs target/scheduler_test_certs
+test-certs: target/autoscaler_test_certs src/scheduler/src/test/resources/certs
 target/autoscaler_test_certs:
 	@./scripts/generate_test_certs.sh
 	@touch $@
-target/scheduler_test_certs:
+src/scheduler/src/test/resources/certs:
 	@./src/scheduler/scripts/generate_unit_test_certs.sh
-	@touch $@
 
 
 .PHONY: test test-autoscaler test-scheduler test-changelog test-changeloglockcleaner
 test: test-autoscaler test-scheduler test-changelog test-changeloglockcleaner test-acceptance-unit
 test-autoscaler: check-db_type init-db test-certs
-	@echo " - using DBURL=${DBURL}"
-	@make --directory='./src/autoscaler' test DBURL="${DBURL}"
+	@echo ' - using DBURL=${DBURL} TEST=${TEST}'
+	@make --directory='./src/autoscaler' test DBURL='${DBURL}' TEST='${TEST}'
 test-autoscaler-suite: check-db_type init-db test-certs
-	@make --directory='./src/autoscaler' testsuite TEST=${TEST} DBURL="${DBURL}"
+	@make --directory='./src/autoscaler' testsuite TEST='${TEST}' DBURL='${DBURL}'
 test-scheduler: check-db_type init-db test-certs
 	@export DB_HOST=${DB_HOST}; \
 	cd src && mvn test --no-transfer-progress -Dspring.profiles.include=${db_type} && cd ..
@@ -372,12 +371,19 @@ build-test-app:
 deploy-test-app:
 	@make --directory='./src/acceptance/assets/app/go_app' deploy
 
+.PHONY: build-acceptance-tests
+build-acceptance-tests:
+	@make --directory='./src/acceptance' build_tests
+
 .PHONY: acceptance-tests
-acceptance-tests: build-test-app
-	${CI_DIR}/autoscaler/scripts/run-acceptance-tests.sh;
+acceptance-tests: build-test-app acceptance-tests-config
+	@make --directory='./src/acceptance' run-acceptance-tests
+.PHONY: acceptance-cleanup
 acceptance-cleanup:
-	${CI_DIR}/autoscaler/scripts/cleanup-acceptance.sh;
-
+	@make --directory='./src/acceptance' acceptance-tests-cleanup
+.PHONY: acceptance-tests-config
+acceptance-tests-config:
+	make --directory='./src/acceptance' acceptance-tests-config
 
 .PHONY: cleanup-concourse
 cleanup-concourse:
@@ -388,7 +394,7 @@ cf-login:
 	@${CI_DIR}/autoscaler/scripts/cf-login.sh
 
 .PHONY: setup-performance
-setup-performance: build-test-app
+setup-performance: build-test-app acceptance-tests-config
 	export NODES=1;\
 	export SUITES="setup_performance";\
 	export DEPLOYMENT_NAME="autoscaler-performance";\
@@ -445,3 +451,9 @@ go-get-u: $(addsuffix .go-get-u,$(go_modules))
 	@echo " - go get -u" $<
 	cd src/$< && \
 	go get -u ./...
+
+
+deploy-apps:
+	echo " - deploying apps"
+	DEBUG="${DEBUG}" ${CI_DIR}/autoscaler/scripts/deploy-apps.sh
+

ci/Makefile

@@ -3,11 +3,14 @@
 set-autoscaler-pipeline:
 	@./autoscaler/set-pipeline.sh
 
+.PHONY: set-infrastructure-pipeline
+set-infrastructure-pipeline:
+	@./infrastructure/set-pipeline.sh
+
 .PHONY: unpause-pipeline
 unpause-pipeline:
 	@./scripts/unpause-pipeline.sh
 
-
 .PHONY: delete-pipeline
 delete-pipeline:
 	@./scripts/delete-pipeline.sh