From bb070496c369dbbb70c5e21e9b33841e2861132b Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Apr 19 2018 15:10:02 +0000 Subject: Tie us to specific bodhi package versions This also means that when we bump this and rerun ansible, openshift will clear the build cache. Signed-off-by: Patrick Uiterwijk --- diff --git a/inventory/group_vars/bodhi-backend b/inventory/group_vars/bodhi-backend index c30905c..ede9728 100644 --- a/inventory/group_vars/bodhi-backend +++ b/inventory/group_vars/bodhi-backend @@ -1,4 +1,6 @@ --- +bodhi_version: 3.6.0 + # common items for the releng-* boxes lvm_size: 100000 mem_size: 16384 diff --git a/inventory/group_vars/bodhi-backend-stg b/inventory/group_vars/bodhi-backend-stg index 692b237..6bc78b8 100644 --- a/inventory/group_vars/bodhi-backend-stg +++ b/inventory/group_vars/bodhi-backend-stg @@ -1,4 +1,6 @@ --- +bodhi_version: 3.6.0 + # common items for the releng-* boxes lvm_size: 100000 mem_size: 4096 diff --git a/inventory/group_vars/bodhi2 b/inventory/group_vars/bodhi2 index 1a11175..aeb24bc 100644 --- a/inventory/group_vars/bodhi2 +++ b/inventory/group_vars/bodhi2 @@ -1,4 +1,6 @@ --- +bodhi_version: 3.6.0 + # Define resources for this group of hosts here. jobrunner: false epelmasher: false diff --git a/inventory/group_vars/bodhi2-stg b/inventory/group_vars/bodhi2-stg index 078f6ac..d3badca 100644 --- a/inventory/group_vars/bodhi2-stg +++ b/inventory/group_vars/bodhi2-stg @@ -1,4 +1,6 @@ --- +bodhi_version: 3.6.0 + # Define resources for this group of hosts here. jobrunner: false epelmasher: false diff --git a/roles/openshift-apps/bodhi/templates/buildconfig.yml b/roles/openshift-apps/bodhi/templates/buildconfig.yml index f7fb211..882580e 100644 --- a/roles/openshift-apps/bodhi/templates/buildconfig.yml +++ b/roles/openshift-apps/bodhi/templates/buildconfig.yml @@ -21,7 +21,7 @@ items: {% endif %} # While dnf has a --nodocs, it doesen't have a --docs... RUN sed -i '/nodocs/d' /etc/dnf/dnf.conf - RUN dnf install -y bodhi-server bodhi-docs + RUN dnf install -y bodhi-server-{{bodhi_version}} bodhi-docs-{{bodhi_version}} # Put the fedmsg config in place RUN rm -f /etc/fedmsg.d/bodhi.py # Let's name it starting with zz so it sorts last.