Attempt to fix oci-build-task config

See gh-24197
2020-12-10 14:35:04 -08:00 · 2020-12-10 14:35:04 -08:00 · 6990fff27a
parent cae5ed81cd
commit 6990fff27a
2 changed files with 8 additions and 8 deletions
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@ -212,18 +212,18 @@ jobs:
  - in_parallel:
    - task: build-ci-image
      privileged: true
-      file: git-repo/ci/tasks/build-ci-image.yml
-      params:
+      file: ci-images-git-repo/ci/tasks/build-ci-image.yml
+      vars:
        ci-image-name: ci-image
    - task: build-ci-image-jdk11
      privileged: true
-      file: git-repo/ci/tasks/build-ci-image.yml
-      params:
+      file: ci-images-git-repo/ci/tasks/build-ci-image.yml
+      vars:
        ci-image-name: ci-image-jdk11
    - task: build-ci-image-jdk15
      privileged: true
-      file: git-repo/ci/tasks/build-ci-image.yml
-      params:
+      file: ci-images-git-repo/ci/tasks/build-ci-image.yml
+      vars:
        ci-image-name: ci-image-jdk15
  - in_parallel:
    - put: ci-image
--- a/ci/tasks/build-ci-image.yml
+++ b/ci/tasks/build-ci-image.yml
@ -12,6 +12,6 @@ caches:
 - path: ci-image-cache
 params:
  CONTEXT: ci-images-git-repo/ci/images
-  DOCKERFILE: ((ci-image-name))/Dockerfile
+  DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile
 run:
-  path: build
+  path: build