From 796e491fc0c7d09593eb38c9264b8a203c2904ae Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Thu, 1 Oct 2020 11:07:07 +0200 Subject: [PATCH] Fix 'upper_constraints_file' job var definition Change-Id: I7b7a06b2989f849f5acf1d9234b6bf7579567833 --- Vagrantfile | 2 +- zuul.d/jobs.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 2f965ac..3dfb4ec 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -8,7 +8,7 @@ VAGRANTFILE_API_VERSION = "2" CPUS = 4 # Customize the amount of memory on the VM -MEMORY = ENV.fetch("VM_SIZE", "8192").to_i +MEMORY = ENV.fetch("VM_SIZE", "12288").to_i # Every Vagrant development environment requires a box. You can search for # boxes at https://vagrantcloud.com/search. diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index f0211f3..5f2a8d3 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -89,9 +89,9 @@ test_log_debug: true test_case_timeout: 1800 tobiko_dir: '/opt/stack/tobiko' - upper_constraints_file: >- - {{ ansible_user_dir }}/src/opendev.org/openstack/requirements/ - upper-constraints.txt' + requirements_dir: >- + {{ ansible_user_dir }}/src/opendev.org/openstack/requirements + upper_constraints_file: '{{ requirements_dir }}/upper-constraints.txt' pre-run: playbooks/devstack/pre.yaml run: playbooks/devstack/run.yaml