Browse Source

Redistribution de la cible deploy dans les recettes des différents projets

jenkins
William Petit 1 year ago
parent
commit
54af7bdaa2
8 changed files with 31 additions and 13 deletions
  1. 4
    2
      Makefile
  2. 4
    2
      targets/alpine.mk
  3. 3
    1
      targets/centos.mk
  4. 4
    2
      targets/crous.mk
  5. 5
    1
      targets/eole-2.5.2.mk
  6. 4
    2
      targets/eole-2.6.2.mk
  7. 3
    1
      targets/mse.mk
  8. 4
    2
      targets/ubuntu.mk

+ 4
- 2
Makefile View File

@@ -1,8 +1,10 @@
1 1
 include targets/*.mk
2 2
 
3
-deploy: deploy-alpine deploy-mse deploy-eole-2.6.2 deploy-eole-2.5.2 deploy-ubuntu deploy-crous deploy-centos
3
+build:
4
+
5
+deploy:
4 6
 
5 7
 clean:
6 8
 	rm -rf images/*
7 9
 
8
-.PHONY: clean all
10
+.PHONY: clean deploy

+ 4
- 2
targets/alpine.mk View File

@@ -1,13 +1,15 @@
1 1
 # Images Alpine
2 2
 ALPINE_DEPS=images/alpine/3.7/alpine-virt/alpine-virt-3.7.img
3 3
 
4
+build: alpine
5
+deploy: deploy-alpine
6
+
4 7
 alpine: $(ALPINE_DEPS)
8
+deploy-alpine: deploy-alpine-virt
5 9
 
6 10
 images/alpine/3.7/alpine-virt/alpine-virt-3.7.img:
7 11
 	rm -rf images/alpine/3.7/alpine-virt
8 12
 	script/build recipes/alpine/3.7/virt.json
9 13
 
10
-deploy-alpine: deploy-alpine-virt
11
-
12 14
 deploy-alpine-virt: images/alpine/3.7/alpine-virt/alpine-virt-3.7.img
13 15
 	script/build recipes/alpine/3.7/deploy-virt.json

+ 3
- 1
targets/centos.mk View File

@@ -1,8 +1,10 @@
1 1
 # Images CentOS
2 2
 CENTOS_DEPS=images/centos/centos-7-mini64/centos-7-mini64.img
3 3
 
4
-centos: $(CENTOS_DEPS)
4
+build: centos
5
+deploy: deploy-centos
5 6
 
7
+centos: $(CENTOS_DEPS)
6 8
 deploy-centos: deploy-centos-7-mini64
7 9
 
8 10
 deploy-centos-7-mini64: images/centos/centos-7-mini64/centos-7-mini64.img

+ 4
- 2
targets/crous.mk View File

@@ -1,13 +1,15 @@
1 1
 # Images CROUS
2 2
 CROUS_DEPS=images/crous/sympa/crous-sympa.img
3 3
 
4
+build: crous
5
+deploy: deploy-crous
6
+
4 7
 crous: $(CROUS_DEPS)
8
+deploy-crous: deploy-crous-sympa
5 9
 
6 10
 images/crous/sympa/crous-sympa.img: images/centos/centos-7-mini64/centos-7-mini64.img
7 11
 	rm -rf images/crous/sympa
8 12
 	script/build recipes/crous/sympa/packer.json
9 13
 
10
-deploy-crous: deploy-crous-sympa
11
-
12 14
 deploy-crous-sympa: images/crous/sympa/crous-sympa.img
13 15
 	script/build recipes/crous/sympa/deploy.json

+ 5
- 1
targets/eole-2.5.2.mk View File

@@ -1,13 +1,17 @@
1 1
 # Images EOLE 2.5.2
2 2
 EOLE_2.5.2_DEPS=images/eole/2.5.2/eolebase/eolebase-2.5.2.img
3 3
 
4
+build: eole-2.5.2
5
+deploy: deploy-eolebase-2.5.2
6
+
4 7
 eole-2.5.2: $(EOLE_2.5.2_DEPS)
8
+deploy-eole-2.5.2: deploy-eolebase-2.5.2
5 9
 
6 10
 images/eole/2.5.2/eolebase/eolebase-2.5.2.img:
7 11
 	rm -rf images/eole/2.5.2/eolebase
8 12
 	script/build recipes/eole/2.5.2/eolebase.json
9 13
 
10
-deploy-eole-2.5.2: deploy-eolebase-2.5.2
14
+
11 15
 
12 16
 deploy-eolebase-2.5.2: images/eole/2.5.2/eolebase/eolebase-2.5.2.img
13 17
 	script/build recipes/eole/2.5.2/deploy-eolebase.json

+ 4
- 2
targets/eole-2.6.2.mk View File

@@ -4,7 +4,11 @@ EOLE_2.6.2_DEPS=images/eole/2.6.2/eolebase/eolebase-2.6.2.img
4 4
 # EOLE_2.6.2_DEPS+=images/eole/2.6.2/cloud/eolebase-cloud-2.6.2.img
5 5
 # EOLE_2.6.2_DEPS+=images/eole/2.6.2/horus/horus-2.6.2.img
6 6
 
7
+build: eole-2.6.2
8
+deploy: deploy-eole-2.6.2
9
+
7 10
 eole-2.6.2: $(EOLE_2.6.2_DEPS)
11
+deploy-eole-2.6.2: deploy-eolebase-2.6.2
8 12
 
9 13
 images/eole/2.6.2/eolebase/eolebase-2.6.2.img:
10 14
 	rm -rf images/eole/2.6.2/eolebase
@@ -22,7 +26,5 @@ images/eole/2.6.2/amon/amon-2.6.2.img:
22 26
 	rm -rf images/eole/2.6.2/amon
23 27
 	script/build recipes/eole/2.6.2/amon.json
24 28
 
25
-deploy-eole-2.6.2: deploy-eolebase-2.6.2
26
-
27 29
 deploy-eolebase-2.6.2: images/eole/2.6.2/eolebase/eolebase-2.6.2.img
28 30
 	script/build recipes/eole/2.6.2/deploy-eolebase.json

+ 3
- 1
targets/mse.mk View File

@@ -4,8 +4,10 @@ MSE_DEPS+=images/mse/mysql/mse-mysql.img
4 4
 MSE_DEPS+=images/mse/ldap/mse-ldap.img
5 5
 MSE_DEPS+=images/mse/portal-2.5.2/mse-portal-2.5.2.img
6 6
 
7
-mse: $(MSE_DEPS)
7
+build: mse
8
+deploy: deploy-mse
8 9
 
10
+mse: $(MSE_DEPS)
9 11
 deploy-mse: deploy-mse-portal deploy-mse-mysql deploy-mse-ldap deploy-mse-portal-2.5.2
10 12
 
11 13
 deploy-mse-portal: images/mse/portal/mse-portal.img

+ 4
- 2
targets/ubuntu.mk View File

@@ -2,7 +2,11 @@
2 2
 UBUNTU_DEPS=images/ubuntu/16.04/light/ubuntu-16.04-light.img
3 3
 #UBUNTU_DEPS+=images/ubuntu/16.04/docker/ubuntu-16.04-docker.img
4 4
 
5
+build: ubuntu
6
+deploy: deploy-ubuntu
7
+
5 8
 ubuntu: $(UBUNTU_DEPS)
9
+deploy-ubuntu: deploy-ubuntu-16.04-light
6 10
 
7 11
 images/ubuntu/16.04/light/ubuntu-16.04-light.img:
8 12
 	rm -rf images/ubuntu/16.04/light
@@ -12,7 +16,5 @@ images/ubuntu/16.04/docker/ubuntu-16.04-docker.img: images/ubuntu/16.04/light/ub
12 16
 	rm -rf images/ubuntu/16.04/docker
13 17
 	script/build recipes/ubuntu/16.04/docker.json
14 18
 
15
-deploy-ubuntu: deploy-ubuntu-16.04-light
16
-
17 19
 deploy-ubuntu-16.04-light: images/ubuntu/16.04/light/ubuntu-16.04-light.img
18 20
 	script/build recipes/ubuntu/16.04/deploy-light.json

Loading…
Cancel
Save