This works, promise!

Signed-off-by: Tom Kerkhove <[email protected]>

build/azure-devops/agents-ci-discovery.yml

@@ -173,9 +173,7 @@ stages:
         variableName: 'Image.Tag'
      - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
         - template: templates/determine-pr-version.yml
-     - template: templates/agents/prepare-ci-config.yml
-       parameters:
-          agentFolderName: 'resource-discovery'
+     - template: templates/agents/prepare-discovery-ci-config.yml
      - ${{ if not(eq(variables['Build.Reason'], 'PullRequest')) }}:
         - template: templates/build-discovery-image.yml
           parameters:

build/azure-devops/agents-ci-scraper.yml

@@ -217,12 +217,8 @@ stages:
              buildArgs: '--build-arg VERSION="$(App.Version)"'
              tags: '--tag promitor-agent-scraper-ci --tag promitor-agent-scraper-ci-non-pr'
              os: '$(OS.Name)'
-     - template: templates/agents/prepare-ci-config.yml
-       parameters:
-          agentFolderName: 'scraper'
-     - template: templates/agents/prepare-ci-config.yml
-       parameters:
-          agentFolderName: 'resource-discovery'
+     - template: templates/agents/prepare-scraper-ci-config.yml
+     - template: templates/agents/prepare-discovery-ci-config.yml
      - template: templates/build-discovery-image.yml
        parameters:
           imageName: '$(Image.ResourceDiscovery.Name)'

build/azure-devops/templates/agents/prepare-discovery-ci-config.yml

@@ -0,0 +1,6 @@
+steps:
+- powershell: |
+   rm $(Pipeline.Workspace)\s\config\promitor\resource-discovery\runtime.yaml
+   copy $(Pipeline.Workspace)\s\config\promitor\resource-discovery\ci-runtime.yaml $(Pipeline.Workspace)\s\config\promitor\resource-discovery\runtime.yaml
+   cat $(Pipeline.Workspace)\s\config\promitor\resource-discovery\runtime.yaml
+  displayName: 'Prepare Resource Discovery runtime config'

build/azure-devops/templates/agents/prepare-scraper-ci-config.yml

@@ -0,0 +1,11 @@
+steps:
+- powershell: |
+   rm $(Pipeline.Workspace)\s\config\promitor\scraper\runtime.yaml
+   copy $(Pipeline.Workspace)\s\config\promitor\scraper\ci-runtime.yaml $(Pipeline.Workspace)\s\config\promitor\scraper\runtime.yaml
+   cat $(Pipeline.Workspace)\s\config\promitor\scraper\runtime.yaml
+  displayName: 'Prepare Scraper runtime config'
+- powershell: |
+   rm $(Pipeline.Workspace)\s\config\promitor\scraper\metrics-declaration.yaml
+   copy $(Pipeline.Workspace)\s\config\promitor\scraper\metrics.yaml $(Pipeline.Workspace)\s\config\promitor\scraper\metrics-declaration.yaml
+   cat $(Pipeline.Workspace)\s\config\promitor\scraper\metrics-declaration.yaml
+  displayName: 'Prepare Scraper metrics declaration config'