From 51d85d91f986067e012ae44d79c3fc76d5c8d456 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 17 Jun 2019 13:31:34 +0000 Subject: [PATCH] coreos-cincinnati: use templated build ref --- .../coreos-cincinnati/templates/buildconfig-stub.yml | 5 ++--- roles/openshift-apps/coreos-cincinnati/vars/production.yml | 1 + roles/openshift-apps/coreos-cincinnati/vars/staging.yml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml b/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml index 2b4188f086..0e57d79f2e 100644 --- a/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml +++ b/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml @@ -1,5 +1,4 @@ --- -# TODO(lucab): template refs from ansible var apiVersion: v1 kind: BuildConfig metadata: @@ -21,10 +20,10 @@ spec: type: "Git" git: uri: "https://github.com/lucab/exp-dumnati.git" - ref: "124d9475717eae13cf2e76a8a455f0ee542a75cb" + ref: "{{dumnati_build_git_sha}}" triggers: - type: "ConfigChange" output: to: kind: "ImageStreamTag" - name: "fedora-coreos-cincinnati:dumnati-124d9475717eae13cf2e76a8a455f0ee542a75cb" + name: "fedora-coreos-cincinnati:dumnati-{{dumnati_build_git_sha}}" diff --git a/roles/openshift-apps/coreos-cincinnati/vars/production.yml b/roles/openshift-apps/coreos-cincinnati/vars/production.yml index ed97d539c0..6d35dd81e4 100644 --- a/roles/openshift-apps/coreos-cincinnati/vars/production.yml +++ b/roles/openshift-apps/coreos-cincinnati/vars/production.yml @@ -1 +1,2 @@ --- +dumnati_build_git_sha: 124d9475717eae13cf2e76a8a455f0ee542a75cb diff --git a/roles/openshift-apps/coreos-cincinnati/vars/staging.yml b/roles/openshift-apps/coreos-cincinnati/vars/staging.yml index ed97d539c0..6d35dd81e4 100644 --- a/roles/openshift-apps/coreos-cincinnati/vars/staging.yml +++ b/roles/openshift-apps/coreos-cincinnati/vars/staging.yml @@ -1 +1,2 @@ --- +dumnati_build_git_sha: 124d9475717eae13cf2e76a8a455f0ee542a75cb