From e23ef1a2ee53ecd4fbc207c4b9240096e799887b Mon Sep 17 00:00:00 2001 From: "Dennis J. Bell" Date: Wed, 8 Nov 2023 22:37:28 -0800 Subject: [PATCH] Get tests to pass for version bumps, dev-tools feature --- manifests/{addons => }/dev-tools.yml | 0 spec/deployments/all-features-all-params.yml | 1 + spec/results/all-features-all-params.yml | 19 +++++++++++-------- spec/results/base.yml | 17 ++++++++++------- spec/results/bastion.yml | 17 ++++++++++------- spec/results/openvpn.yml | 17 ++++++++++------- 6 files changed, 42 insertions(+), 29 deletions(-) rename manifests/{addons => }/dev-tools.yml (100%) diff --git a/manifests/addons/dev-tools.yml b/manifests/dev-tools.yml similarity index 100% rename from manifests/addons/dev-tools.yml rename to manifests/dev-tools.yml diff --git a/spec/deployments/all-features-all-params.yml b/spec/deployments/all-features-all-params.yml index cf5d963..c68a565 100644 --- a/spec/deployments/all-features-all-params.yml +++ b/spec/deployments/all-features-all-params.yml @@ -3,6 +3,7 @@ kit: features: - openvpn - bastion + - dev-tools genesis: env: all-features-all-params diff --git a/spec/results/all-features-all-params.yml b/spec/results/all-features-all-params.yml index 55b9454..68211d8 100644 --- a/spec/results/all-features-all-params.yml +++ b/spec/results/all-features-all-params.yml @@ -1,11 +1,14 @@ exodus: bosh: all-features-all-params - features: openvpn,bastion + features: openvpn,bastion,dev-tools is_director: false use_create_env: false instance_groups: - azs: - z1 + env: + bosh: + remove_dev_tools: false instances: 1 jobs: - name: jumpbox @@ -83,13 +86,13 @@ instance_groups: name: all-features-all-params-jumpbox releases: - name: jumpbox - sha1: 3b637bc0dd928fdf65b06f49b584fa395247b030 - url: https://github.com/cloudfoundry-community/jumpbox-boshrelease/releases/download/v4.14.2/jumpbox-4.14.2.tgz - version: 4.14.2 + sha1: f824e44d3d4b2a569591309f4d0187fe0c7c5bf2 + url: https://github.com/cloudfoundry-community/jumpbox-boshrelease/releases/download/v5.0.0/jumpbox-5.0.0.tgz + version: 5.0.0 - name: toolbelt - sha1: 377b390b7f5d358a2dae463109350250a769eb3f - url: https://bosh.io/d/github.com/cloudfoundry-community/toolbelt-boshrelease?v=3.7.0 - version: 3.7.0 + sha1: be140444c62cfbfcc9a809b0a343e3736fac6e9d + url: https://github.com/cloudfoundry-community/toolbelt-boshrelease/releases/download/v3.7.1/toolbelt-3.7.1.tgz + version: 3.7.1 - name: openvpn sha1: 3e202404b9140c3eeccfb7456c038cbe95241e8d url: https://github.com/cloudfoundry-community/openvpn-bosh-release/releases/download/v5.8.4/openvpn-boshrelease-5.8.4.tar.gz @@ -100,7 +103,7 @@ releases: version: 9 stemcells: - alias: default - os: ubuntu-bionic + os: ubuntu-jammy version: latest update: canaries: 1 diff --git a/spec/results/base.yml b/spec/results/base.yml index 0233881..8976b21 100644 --- a/spec/results/base.yml +++ b/spec/results/base.yml @@ -6,6 +6,9 @@ exodus: instance_groups: - azs: - z1 + env: + bosh: + remove_dev_tools: true instances: 1 jobs: - name: jumpbox @@ -40,16 +43,16 @@ instance_groups: name: base-jumpbox releases: - name: jumpbox - sha1: 3b637bc0dd928fdf65b06f49b584fa395247b030 - url: https://github.com/cloudfoundry-community/jumpbox-boshrelease/releases/download/v4.14.2/jumpbox-4.14.2.tgz - version: 4.14.2 + sha1: f824e44d3d4b2a569591309f4d0187fe0c7c5bf2 + url: https://github.com/cloudfoundry-community/jumpbox-boshrelease/releases/download/v5.0.0/jumpbox-5.0.0.tgz + version: 5.0.0 - name: toolbelt - sha1: 377b390b7f5d358a2dae463109350250a769eb3f - url: https://bosh.io/d/github.com/cloudfoundry-community/toolbelt-boshrelease?v=3.7.0 - version: 3.7.0 + sha1: be140444c62cfbfcc9a809b0a343e3736fac6e9d + url: https://github.com/cloudfoundry-community/toolbelt-boshrelease/releases/download/v3.7.1/toolbelt-3.7.1.tgz + version: 3.7.1 stemcells: - alias: default - os: ubuntu-bionic + os: ubuntu-jammy version: latest update: canaries: 1 diff --git a/spec/results/bastion.yml b/spec/results/bastion.yml index 7c2edd8..ae1bd8b 100644 --- a/spec/results/bastion.yml +++ b/spec/results/bastion.yml @@ -6,6 +6,9 @@ exodus: instance_groups: - azs: - z1 + env: + bosh: + remove_dev_tools: true instances: 1 jobs: - name: jumpbox @@ -44,16 +47,16 @@ instance_groups: name: bastion-jumpbox releases: - name: jumpbox - sha1: 3b637bc0dd928fdf65b06f49b584fa395247b030 - url: https://github.com/cloudfoundry-community/jumpbox-boshrelease/releases/download/v4.14.2/jumpbox-4.14.2.tgz - version: 4.14.2 + sha1: f824e44d3d4b2a569591309f4d0187fe0c7c5bf2 + url: https://github.com/cloudfoundry-community/jumpbox-boshrelease/releases/download/v5.0.0/jumpbox-5.0.0.tgz + version: 5.0.0 - name: toolbelt - sha1: 377b390b7f5d358a2dae463109350250a769eb3f - url: https://bosh.io/d/github.com/cloudfoundry-community/toolbelt-boshrelease?v=3.7.0 - version: 3.7.0 + sha1: be140444c62cfbfcc9a809b0a343e3736fac6e9d + url: https://github.com/cloudfoundry-community/toolbelt-boshrelease/releases/download/v3.7.1/toolbelt-3.7.1.tgz + version: 3.7.1 stemcells: - alias: default - os: ubuntu-bionic + os: ubuntu-jammy version: latest update: canaries: 1 diff --git a/spec/results/openvpn.yml b/spec/results/openvpn.yml index 41f2c71..d69e475 100644 --- a/spec/results/openvpn.yml +++ b/spec/results/openvpn.yml @@ -6,6 +6,9 @@ exodus: instance_groups: - azs: - z1 + env: + bosh: + remove_dev_tools: true instances: 1 jobs: - name: jumpbox @@ -73,13 +76,13 @@ instance_groups: name: openvpn-jumpbox releases: - name: jumpbox - sha1: 3b637bc0dd928fdf65b06f49b584fa395247b030 - url: https://github.com/cloudfoundry-community/jumpbox-boshrelease/releases/download/v4.14.2/jumpbox-4.14.2.tgz - version: 4.14.2 + sha1: f824e44d3d4b2a569591309f4d0187fe0c7c5bf2 + url: https://github.com/cloudfoundry-community/jumpbox-boshrelease/releases/download/v5.0.0/jumpbox-5.0.0.tgz + version: 5.0.0 - name: toolbelt - sha1: 377b390b7f5d358a2dae463109350250a769eb3f - url: https://bosh.io/d/github.com/cloudfoundry-community/toolbelt-boshrelease?v=3.7.0 - version: 3.7.0 + sha1: be140444c62cfbfcc9a809b0a343e3736fac6e9d + url: https://github.com/cloudfoundry-community/toolbelt-boshrelease/releases/download/v3.7.1/toolbelt-3.7.1.tgz + version: 3.7.1 - name: openvpn sha1: 3e202404b9140c3eeccfb7456c038cbe95241e8d url: https://github.com/cloudfoundry-community/openvpn-bosh-release/releases/download/v5.8.4/openvpn-boshrelease-5.8.4.tar.gz @@ -90,7 +93,7 @@ releases: version: 9 stemcells: - alias: default - os: ubuntu-bionic + os: ubuntu-jammy version: latest update: canaries: 1