@@ -44,7 +44,7 @@ MANALA_DOCKER_RUN_OPTIONS = --privileged
4444MANALA_DOCKER_VOLUMES = \
4545 $(ROLE_DIR ) :/etc/ansible/roles/$(ROLE ) \
4646 $(if $(CACHE_DIR ) , \
47- $(call if_in,$(DISTRIBUTION_ID ) ,debian ubuntu , \
47+ $(call if_in,$(DISTRIBUTION_ID ) ,debian, \
4848 $(CACHE_DIR ) /$(DISTRIBUTION_ID ) /$(DISTRIBUTION_RELEASE ) /apt/archives:/var/cache/apt/archives \
4949 $(CACHE_DIR ) /$(DISTRIBUTION_ID ) /$(DISTRIBUTION_RELEASE ) /apt/lists:/var/lib/apt/lists \
5050 ) \
@@ -77,10 +77,6 @@ sh: .fail_if_host_not(local)
7777 $(call log_warning,Shell on \"$(DISTRIBUTION ) \" is not supported) \
7878 )
7979
80- SH_HELP += $(call if_in,debian.wheezy,$(ROLE_DISTRIBUTIONS ) ,$(call help,sh.debian.wheezy, Open shell on test host - Debian Wheezy) )
81- sh.debian.wheezy : DISTRIBUTION = debian.wheezy
82- sh.debian.wheezy : sh
83-
8480SH_HELP += $(call if_in,debian.jessie,$(ROLE_DISTRIBUTIONS ) ,$(call help,sh.debian.jessie, Open shell on test host - Debian Jessie) )
8581sh.debian.jessie : DISTRIBUTION = debian.jessie
8682sh.debian.jessie : sh
@@ -93,14 +89,6 @@ SH_HELP += $(call if_in,debian.buster,$(ROLE_DISTRIBUTIONS),$(call help,sh.debia
9389sh.debian.buster : DISTRIBUTION = debian.buster
9490sh.debian.buster : sh
9591
96- SH_HELP += $(call if_in,centos.7,$(ROLE_DISTRIBUTIONS ) ,$(call help,sh.centos.7, Open shell on test host - CentOS 7) )
97- sh.centos.7 : DISTRIBUTION = centos.7
98- sh.centos.7 : sh
99-
100- SH_HELP += $(call if_in,ubuntu.xenial,$(ROLE_DISTRIBUTIONS ) ,$(call help,sh.ubuntu.xenial, Open shell on test host - Ubuntu Xenial) )
101- sh.ubuntu.xenial : DISTRIBUTION = ubuntu.xenial
102- sh.ubuntu.xenial : sh
103-
10492# #########
10593# Update #
10694# #########
@@ -120,10 +108,6 @@ update: .fail_if_host_not(local)
120108 ) \
121109 )
122110
123- UPDATE_HELP += $(call if_in,debian.wheezy,$(ROLE_DISTRIBUTIONS ) ,$(call help,update.debian.wheezy, Update test host - Debian Wheezy) )
124- update.debian.wheezy : DISTRIBUTIONS = debian.wheezy
125- update.debian.wheezy : update
126-
127111UPDATE_HELP += $(call if_in,debian.jessie,$(ROLE_DISTRIBUTIONS ) ,$(call help,update.debian.jessie, Update test host - Debian Jessie) )
128112update.debian.jessie : DISTRIBUTIONS = debian.jessie
129113update.debian.jessie : update
@@ -136,14 +120,6 @@ UPDATE_HELP += $(call if_in,debian.buster,$(ROLE_DISTRIBUTIONS),$(call help,upda
136120update.debian.buster : DISTRIBUTIONS = debian.buster
137121update.debian.buster : update
138122
139- UPDATE_HELP += $(call if_in,centos.7,$(ROLE_DISTRIBUTIONS ) ,$(call help,update.centos.7, Update test host - CentOS 7) )
140- update.centos.7 : DISTRIBUTIONS = centos.7
141- update.centos.7 : update
142-
143- UPDATE_HELP += $(call if_in,ubuntu.xenial,$(ROLE_DISTRIBUTIONS ) ,$(call help,update.ubuntu.xenial, Update test host - Ubuntu Xenial) )
144- update.ubuntu.xenial : DISTRIBUTIONS = ubuntu.xenial
145- update.ubuntu.xenial : update
146-
147123# #######
148124# Lint #
149125# #######
@@ -170,10 +146,6 @@ lint@local: .fail_if_host_not(local)
170146lint@test : .fail_if_host_not(test)
171147 ansible-lint --force-color -v $(ROLE_DIR )
172148
173- LINT_HELP_LOCAL += $(call if_in,debian.wheezy,$(ROLE_DISTRIBUTIONS ) ,$(call help,lint.debian.wheezy, Lint role - Debian Wheezy) )
174- lint.debian.wheezy : DISTRIBUTIONS = debian.wheezy
175- lint.debian.wheezy : lint@local
176-
177149LINT_HELP_LOCAL += $(call if_in,debian.jessie,$(ROLE_DISTRIBUTIONS ) ,$(call help,lint.debian.jessie, Lint role - Debian Jessie) )
178150lint.debian.jessie : DISTRIBUTIONS = debian.jessie
179151lint.debian.jessie : lint@local
@@ -186,14 +158,6 @@ LINT_HELP_LOCAL += $(call if_in,debian.buster,$(ROLE_DISTRIBUTIONS),$(call help,
186158lint.debian.buster : DISTRIBUTIONS = debian.buster
187159lint.debian.buster : lint@local
188160
189- LINT_HELP_LOCAL += $(call if_in,centos.7,$(ROLE_DISTRIBUTIONS ) ,$(call help,lint.centos.7, Lint role - CentOS 7) )
190- lint.centos.7 : DISTRIBUTIONS = centos.7
191- lint.centos.7 : lint@local
192-
193- LINT_HELP_LOCAL += $(call if_in,ubuntu.xenial,$(ROLE_DISTRIBUTIONS ) ,$(call help,lint.ubuntu.xenial, Lint role - Ubuntu Xenial) )
194- lint.ubuntu.xenial : DISTRIBUTIONS = ubuntu.xenial
195- lint.ubuntu.xenial : lint@local
196-
197161# #######
198162# Test #
199163# #######
@@ -242,10 +206,6 @@ test@test: .fail_if_host_not(test)
242206 $$(MAKE ) $$(TEST ) \
243207 )
244208
245- TEST_HELP_LOCAL += $(call if_in,debian.wheezy,$(ROLE_DISTRIBUTIONS ) ,$(call help,test.debian.wheezy, Test role - Debian Wheezy) )
246- test.debian.wheezy : DISTRIBUTIONS = debian.wheezy
247- test.debian.wheezy : test@local
248-
249209TEST_HELP_LOCAL += $(call if_in,debian.jessie,$(ROLE_DISTRIBUTIONS ) ,$(call help,test.debian.jessie, Test role - Debian Jessie) )
250210test.debian.jessie : DISTRIBUTIONS = debian.jessie
251211test.debian.jessie : test@local
@@ -257,11 +217,3 @@ test.debian.stretch: test@local
257217TEST_HELP_LOCAL += $(call if_in,debian.buster,$(ROLE_DISTRIBUTIONS ) ,$(call help,test.debian.buster, Test role - Debian Buster) )
258218test.debian.buster : DISTRIBUTIONS = debian.buster
259219test.debian.buster : test@local
260-
261- TEST_HELP_LOCAL += $(call if_in,centos.7,$(ROLE_DISTRIBUTIONS ) ,$(call help,test.centos.7, Test role - CentOS 7) )
262- test.centos.7 : DISTRIBUTIONS = centos.7
263- test.centos.7 : test@local
264-
265- TEST_HELP_LOCAL += $(call if_in,ubuntu.xenial,$(ROLE_DISTRIBUTIONS ) ,$(call help,test.ubuntu.xenial, Test role - Ubuntu Xenial) )
266- test.ubuntu.xenial : DISTRIBUTIONS = ubuntu.xenial
267- test.ubuntu.xenial : test@local
0 commit comments