From 3d6406e99c02b99be32ea02aa7887b81b2d41904 Mon Sep 17 00:00:00 2001 From: noelmcloughlin Date: Tue, 25 Jan 2022 17:42:30 +0000 Subject: [PATCH 1/2] ci(example): remove blockbox as example of raw --- pillar.example | 7 ------- test/integration/default/files/_mapdata/debian-10.yaml | 6 ------ test/integration/default/files/_mapdata/debian-11.yaml | 6 ------ test/integration/default/files/_mapdata/debian-9.yaml | 6 ------ test/integration/default/files/_mapdata/ubuntu-18.yaml | 6 ------ test/integration/default/files/_mapdata/ubuntu-20.yaml | 6 ------ test/salt/pillar/debian.sls | 7 ------- test/salt/pillar/ubuntu.sls | 7 ------- 8 files changed, 51 deletions(-) diff --git a/pillar.example b/pillar.example index 3a00266..ae39cef 100644 --- a/pillar.example +++ b/pillar.example @@ -139,13 +139,6 @@ packages: source: https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 hashsum: md5=1c947d57fce2f21ce0b43fe2ed7cd361 # yamllint enable rule:line-length - blockbox: - dest: /usr/local/src/ - dl: - format: raw - # yamllint disable-line rule:line-length - source: https://raw.githubusercontent.com/openstack/cinder/master/contrib/block-box/docker-compose.yml - hashsum: 1751f8e4f6b4cddd8c4843a0f4473274 kubectl: dest: /usr/local/bin dl: diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index ed99298..1eae605 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -17,12 +17,6 @@ values: unwanted: - /usr/local/boring_archive_software wanted: - blockbox: - dest: /usr/local/src/ - dl: - format: raw - hashsum: 1751f8e4f6b4cddd8c4843a0f4473274 - source: https://raw.githubusercontent.com/openstack/cinder/master/contrib/block-box/docker-compose.yml kubectl: dest: /usr/local/bin dl: diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index bc909da..eec02ae 100644 --- a/test/integration/default/files/_mapdata/debian-11.yaml +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -17,12 +17,6 @@ values: unwanted: - /usr/local/boring_archive_software wanted: - blockbox: - dest: /usr/local/src/ - dl: - format: raw - hashsum: 1751f8e4f6b4cddd8c4843a0f4473274 - source: https://raw.githubusercontent.com/openstack/cinder/master/contrib/block-box/docker-compose.yml kubectl: dest: /usr/local/bin dl: diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index eb0a214..86cfb28 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -17,12 +17,6 @@ values: unwanted: - /usr/local/boring_archive_software wanted: - blockbox: - dest: /usr/local/src/ - dl: - format: raw - hashsum: 1751f8e4f6b4cddd8c4843a0f4473274 - source: https://raw.githubusercontent.com/openstack/cinder/master/contrib/block-box/docker-compose.yml kubectl: dest: /usr/local/bin dl: diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 6f3ab81..d8ccdb7 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -17,12 +17,6 @@ values: unwanted: - /usr/local/boring_archive_software wanted: - blockbox: - dest: /usr/local/src/ - dl: - format: raw - hashsum: 1751f8e4f6b4cddd8c4843a0f4473274 - source: https://raw.githubusercontent.com/openstack/cinder/master/contrib/block-box/docker-compose.yml phantomjs: dest: /usr/local/src/ dl: diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index 20b3521..92976ff 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -17,12 +17,6 @@ values: unwanted: - /usr/local/boring_archive_software wanted: - blockbox: - dest: /usr/local/src/ - dl: - format: raw - hashsum: 1751f8e4f6b4cddd8c4843a0f4473274 - source: https://raw.githubusercontent.com/openstack/cinder/master/contrib/block-box/docker-compose.yml phantomjs: dest: /usr/local/src/ dl: diff --git a/test/salt/pillar/debian.sls b/test/salt/pillar/debian.sls index d56dee9..76d8c9b 100644 --- a/test/salt/pillar/debian.sls +++ b/test/salt/pillar/debian.sls @@ -126,13 +126,6 @@ packages: source: https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 hashsum: md5=1c947d57fce2f21ce0b43fe2ed7cd361 # yamllint enable rule:line-length - blockbox: - dest: /usr/local/src/ - dl: - format: raw - # yamllint disable-line rule:line-length - source: https://raw.githubusercontent.com/openstack/cinder/master/contrib/block-box/docker-compose.yml - hashsum: 1751f8e4f6b4cddd8c4843a0f4473274 kubectl: dest: /usr/local/bin dl: diff --git a/test/salt/pillar/ubuntu.sls b/test/salt/pillar/ubuntu.sls index b964eef..d5c8771 100644 --- a/test/salt/pillar/ubuntu.sls +++ b/test/salt/pillar/ubuntu.sls @@ -89,13 +89,6 @@ packages: source: https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 hashsum: md5=1c947d57fce2f21ce0b43fe2ed7cd361 # yamllint enable rule:line-length - blockbox: - dest: /usr/local/src/ - dl: - format: raw - # yamllint disable-line rule:line-length - source: https://raw.githubusercontent.com/openstack/cinder/master/contrib/block-box/docker-compose.yml - hashsum: 1751f8e4f6b4cddd8c4843a0f4473274 unwanted: - /usr/local/boring_archive_software From c49010a49f8fe780801a898434998ce0a1a8bc7d Mon Sep 17 00:00:00 2001 From: noelmcloughlin Date: Tue, 25 Jan 2022 18:00:33 +0000 Subject: [PATCH 2/2] ci(archive): remove docker-compose.yml test --- test/integration/default/controls/archives_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/integration/default/controls/archives_spec.rb b/test/integration/default/controls/archives_spec.rb index bd10e6f..523f5f3 100644 --- a/test/integration/default/controls/archives_spec.rb +++ b/test/integration/default/controls/archives_spec.rb @@ -10,7 +10,6 @@ end %w[ - docker-compose.yml phantomjs-2.1.1-linux-x86_64/bin ].each do |f| describe file("/usr/local/src/#{f}") do