diff --git a/tile_generator/config.py b/tile_generator/config.py index 9f2203c..5a26ddd 100644 --- a/tile_generator/config.py +++ b/tile_generator/config.py @@ -308,12 +308,20 @@ def validate(self): def default_stemcell(self): stemcell_criteria = self.get('stemcell_criteria', {}) - stemcell_criteria['os'] = stemcell_criteria.get('os', 'ubuntu-xenial') + stemcell_criteria['os'] = stemcell_criteria.get('os', 'ubuntu-jammy') stemcell_criteria['version'] = stemcell_criteria.get('version', self.latest_stemcell(stemcell_criteria['os'])) return stemcell_criteria def latest_stemcell(self, os): - if os == 'ubuntu-xenial': + if os == 'ubuntu-jammy': + headers = { 'Accept': 'application/json' } + response = requests.get('https://network.pivotal.io/api/v2/products/stemcells-ubuntu-jammy/releases', headers=headers) + response.raise_for_status() + releases = response.json()['releases'] + versions = [r['version'] for r in releases] + latest_major = sorted(versions, key=float)[-1].split('.')[0] + return latest_major + elif os == 'ubuntu-xenial': headers = { 'Accept': 'application/json' } response = requests.get('https://network.pivotal.io/api/v2/products/stemcells-ubuntu-xenial/releases', headers=headers) response.raise_for_status() diff --git a/tile_generator/test_config_expected_output.json b/tile_generator/test_config_expected_output.json index 4f2963c..958130b 100644 --- a/tile_generator/test_config_expected_output.json +++ b/tile_generator/test_config_expected_output.json @@ -4240,7 +4240,7 @@ "space": "test-tile-space", "standalone": false, "stemcell_criteria": { - "os": "ubuntu-xenial", + "os": "ubuntu-jammy", "version": "1234" }, "update": { @@ -4251,4 +4251,4 @@ }, "verbose": false, "version": "0.0.1" -} \ No newline at end of file +} diff --git a/tile_generator/test_metadata_expected_output.yml b/tile_generator/test_metadata_expected_output.yml index 181e379..85ad62c 100644 --- a/tile_generator/test_metadata_expected_output.yml +++ b/tile_generator/test_metadata_expected_output.yml @@ -18,7 +18,7 @@ standalone: false releases: stemcell_criteria: - os: ubuntu-xenial + os: ubuntu-jammy requires_cpi: false version: '1234'