From a2593ff353f9ad3481f7549b016a454d5998eebd Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Wed, 19 Aug 2020 10:41:52 +0800 Subject: [PATCH 01/10] git submodule update --remote --- roles/catatonit | 2 +- roles/fisheye | 2 +- roles/gosu | 2 +- roles/openjdk | 2 +- roles/timezone | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/catatonit b/roles/catatonit index 90896e9..da38c90 160000 --- a/roles/catatonit +++ b/roles/catatonit @@ -1 +1 @@ -Subproject commit 90896e9603cbd8df3bc16dacc64431b1064db170 +Subproject commit da38c90687858c9c4c3fd96a2d7eff498da60953 diff --git a/roles/fisheye b/roles/fisheye index 1c46fa5..1f2b00a 160000 --- a/roles/fisheye +++ b/roles/fisheye @@ -1 +1 @@ -Subproject commit 1c46fa50d8b2afe9e952747e00c975f3002a01c3 +Subproject commit 1f2b00a3fe6580f879cecd2c317ad45995dc693d diff --git a/roles/gosu b/roles/gosu index b9e4955..878861f 160000 --- a/roles/gosu +++ b/roles/gosu @@ -1 +1 @@ -Subproject commit b9e4955a57d191b66df373205267d23f4e74b96c +Subproject commit 878861f022e83e725052d21a624b2a63b56de4db diff --git a/roles/openjdk b/roles/openjdk index 842de8a..a45cc6b 160000 --- a/roles/openjdk +++ b/roles/openjdk @@ -1 +1 @@ -Subproject commit 842de8a626db2038f8961433914d152d5a52f3ea +Subproject commit a45cc6bfb59721a77ede991df7dc88c95d732ab8 diff --git a/roles/timezone b/roles/timezone index c4d3c09..c3b00b6 160000 --- a/roles/timezone +++ b/roles/timezone @@ -1 +1 @@ -Subproject commit c4d3c09f843608ff0f902161229ed3aa5c33f74b +Subproject commit c3b00b65c25c72e36955d10439bf71ca6bd19344 From 52e9bae50a08934b6210399e3173b0407beb3946 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Wed, 19 Aug 2020 10:56:12 +0800 Subject: [PATCH 02/10] git submodule update --remote --- roles/git | 2 +- roles/openjdk | 2 +- roles/perforce | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/git b/roles/git index fbc8c6b..80019ea 160000 --- a/roles/git +++ b/roles/git @@ -1 +1 @@ -Subproject commit fbc8c6b521a5059a647a7479262a9cae9bea7e43 +Subproject commit 80019ea8adbd06c05653f4365e4dae601ba0555a diff --git a/roles/openjdk b/roles/openjdk index a45cc6b..d6f3393 160000 --- a/roles/openjdk +++ b/roles/openjdk @@ -1 +1 @@ -Subproject commit a45cc6bfb59721a77ede991df7dc88c95d732ab8 +Subproject commit d6f339357a2e457faffd41caeab96f9084d24ea0 diff --git a/roles/perforce b/roles/perforce index 076e1ef..52303e1 160000 --- a/roles/perforce +++ b/roles/perforce @@ -1 +1 @@ -Subproject commit 076e1ef8600249d801dc2081e8a2b61008006556 +Subproject commit 52303e15fdbb4df953bda0a4f13ef79f378fa7e4 From 2b0beb8be74de9a69cb83b1d219cd3e2e36d1555 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Wed, 19 Aug 2020 12:05:56 +0800 Subject: [PATCH 03/10] To remove this warning, please specify an explicit value for it now. --- molecule/default/create.yml | 2 ++ molecule/default/destroy.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/molecule/default/create.yml b/molecule/default/create.yml index 28946c7..d4c29a0 100644 --- a/molecule/default/create.yml +++ b/molecule/default/create.yml @@ -37,6 +37,7 @@ build: path: "{{ molecule_ephemeral_directory }}" dockerfile: "{{ molecule_ephemeral_directory }}/Dockerfile-{{ item.name }}" + pull: true loop_control: label: "{{ item.name }}" loop: "{{ molecule_yml.platforms }}" @@ -71,6 +72,7 @@ tty: "{{ item.tty | default(omit) }}" volumes: "{{ item.volumes | default(omit) }}" env: "{{ item.env | default(omit) }}" + container_default_behavior: "no_defaults" state: "started" loop_control: label: "{{ item.name }}" diff --git a/molecule/default/destroy.yml b/molecule/default/destroy.yml index 82dc2a5..e8c2531 100644 --- a/molecule/default/destroy.yml +++ b/molecule/default/destroy.yml @@ -47,6 +47,7 @@ - name: docker rm docker_container: name: "{{ item.name }}" + container_default_behavior: "no_defaults" state: "absent" loop_control: label: "{{ item.name }}" From 8ab12700ef4d2fe3bd87336ca07e171cd2f15929 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Wed, 19 Aug 2020 22:10:35 +0800 Subject: [PATCH 04/10] dest: "{{ molecule_ephemeral_directory }}/{{ item.name }}/Dockerfile" --- ansible-galaxy-requirements.yml | 4 ++++ molecule/default/create.yml | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ansible-galaxy-requirements.yml b/ansible-galaxy-requirements.yml index 98c9fba..9cebffb 100644 --- a/ansible-galaxy-requirements.yml +++ b/ansible-galaxy-requirements.yml @@ -19,6 +19,10 @@ collections: src: https://galaxy.ansible.com version: ">=1.0.0,<2.0.0" + - name: containers.podman + src: https://galaxy.ansible.com + version: ">=1.0.0,<2.0.0" + - name: operator_sdk.util src: https://galaxy.ansible.com version: ">=0.0.0,<1.0.0" diff --git a/molecule/default/create.yml b/molecule/default/create.yml index d4c29a0..08b1896 100644 --- a/molecule/default/create.yml +++ b/molecule/default/create.yml @@ -20,10 +20,20 @@ become: true gather_facts: false tasks: + - name: prepare directories + file: + dest: "{{ molecule_ephemeral_directory }}/{{ item.name }}" + mode: "0755" + state: "directory" + loop_control: + label: "{{ item.name }}" + loop: "{{ molecule_yml.platforms }}" + when: item.dockerfile is defined + - name: copy template template: src: "{{ molecule_scenario_directory }}/{{ item.dockerfile }}" - dest: "{{ molecule_ephemeral_directory }}/Dockerfile-{{ item.name }}" + dest: "{{ molecule_ephemeral_directory }}/{{ item.name }}/Dockerfile" mode: "0644" loop_control: label: "{{ item.name }}" @@ -35,8 +45,7 @@ name: "{{ molecule_ephemeral_directory | regex_replace('^.*/([^/]*/[^/]*)$', '\\1') }}:{{ item.name }}" source: "build" build: - path: "{{ molecule_ephemeral_directory }}" - dockerfile: "{{ molecule_ephemeral_directory }}/Dockerfile-{{ item.name }}" + path: "{{ molecule_ephemeral_directory }}/{{ item.name }}" pull: true loop_control: label: "{{ item.name }}" From d1324e423847993931a14135afd6de34bc885379 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Wed, 19 Aug 2020 22:17:57 +0800 Subject: [PATCH 05/10] git submodule update --remote --- roles/catatonit | 2 +- roles/cvs | 2 +- roles/fisheye | 2 +- roles/git | 2 +- roles/gosu | 2 +- roles/locales | 2 +- roles/mercurial | 2 +- roles/openjdk | 2 +- roles/perforce | 2 +- roles/python | 2 +- roles/svn | 2 +- roles/timezone | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/catatonit b/roles/catatonit index da38c90..fc46851 160000 --- a/roles/catatonit +++ b/roles/catatonit @@ -1 +1 @@ -Subproject commit da38c90687858c9c4c3fd96a2d7eff498da60953 +Subproject commit fc46851031a4041078184d4ef97f8c5655f88f61 diff --git a/roles/cvs b/roles/cvs index 89d37f0..6c7f062 160000 --- a/roles/cvs +++ b/roles/cvs @@ -1 +1 @@ -Subproject commit 89d37f09eb379a86426230fc3ef7b7f0464a4e57 +Subproject commit 6c7f06261ccee85f1402079225dfd5401dd31f51 diff --git a/roles/fisheye b/roles/fisheye index 1f2b00a..6cedf23 160000 --- a/roles/fisheye +++ b/roles/fisheye @@ -1 +1 @@ -Subproject commit 1f2b00a3fe6580f879cecd2c317ad45995dc693d +Subproject commit 6cedf23eb7e786d467a6dd036d83deee7b725b38 diff --git a/roles/git b/roles/git index 80019ea..2de2635 160000 --- a/roles/git +++ b/roles/git @@ -1 +1 @@ -Subproject commit 80019ea8adbd06c05653f4365e4dae601ba0555a +Subproject commit 2de2635119d57fe1d5133dbf033ae950d4c07856 diff --git a/roles/gosu b/roles/gosu index 878861f..084616d 160000 --- a/roles/gosu +++ b/roles/gosu @@ -1 +1 @@ -Subproject commit 878861f022e83e725052d21a624b2a63b56de4db +Subproject commit 084616dda8ee7fd43f355c2b6efa55b5d65064d9 diff --git a/roles/locales b/roles/locales index 9a4823d..68396a1 160000 --- a/roles/locales +++ b/roles/locales @@ -1 +1 @@ -Subproject commit 9a4823db4e9d70d8ec295b225bb0eee248650f5e +Subproject commit 68396a1ecf4122ef64bc0fe79257cd22d7ddb3c1 diff --git a/roles/mercurial b/roles/mercurial index 5bd7e55..75e9c73 160000 --- a/roles/mercurial +++ b/roles/mercurial @@ -1 +1 @@ -Subproject commit 5bd7e556b0a5f880d470dbb1f618e1d231043c78 +Subproject commit 75e9c738cf2bce161cbba27f7e0bd5529c8da20c diff --git a/roles/openjdk b/roles/openjdk index d6f3393..7846a30 160000 --- a/roles/openjdk +++ b/roles/openjdk @@ -1 +1 @@ -Subproject commit d6f339357a2e457faffd41caeab96f9084d24ea0 +Subproject commit 7846a300c95714e497166c81e08702d413b4bb82 diff --git a/roles/perforce b/roles/perforce index 52303e1..4dc522a 160000 --- a/roles/perforce +++ b/roles/perforce @@ -1 +1 @@ -Subproject commit 52303e15fdbb4df953bda0a4f13ef79f378fa7e4 +Subproject commit 4dc522ae3dc3b1604f1204b6c52d38d06a040ed0 diff --git a/roles/python b/roles/python index 62de7a8..0ecbc2b 160000 --- a/roles/python +++ b/roles/python @@ -1 +1 @@ -Subproject commit 62de7a8763b46f2629a8e11a439ac6fc116326a0 +Subproject commit 0ecbc2b94a8952a820719ab68d68e5f1793c8821 diff --git a/roles/svn b/roles/svn index 83a8eff..bf245f4 160000 --- a/roles/svn +++ b/roles/svn @@ -1 +1 @@ -Subproject commit 83a8eff4a23726c55e818007d3ccee1d684bc451 +Subproject commit bf245f4f50dd6dad203271e3435f0bfaccab1efc diff --git a/roles/timezone b/roles/timezone index c3b00b6..ca49690 160000 --- a/roles/timezone +++ b/roles/timezone @@ -1 +1 @@ -Subproject commit c3b00b65c25c72e36955d10439bf71ca6bd19344 +Subproject commit ca496905c89e11d81a5eb1e806e38a3101372988 From 00cb8a8d2a6d8648f91aefccca43f6ef39439e07 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Fri, 21 Aug 2020 11:40:29 +0800 Subject: [PATCH 06/10] pip install ansible-lint~=4.3.1 --- requirements.txt | 2 +- roles/catatonit | 2 +- roles/cvs | 2 +- roles/fisheye | 2 +- roles/git | 2 +- roles/gosu | 2 +- roles/locales | 2 +- roles/mercurial | 2 +- roles/openjdk | 2 +- roles/perforce | 2 +- roles/python | 2 +- roles/svn | 2 +- roles/timezone | 2 +- scripts/bootstrap-ansible.sh | 3 +++ 14 files changed, 16 insertions(+), 13 deletions(-) diff --git a/requirements.txt b/requirements.txt index 74cbbf3..5d61b52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ # limitations under the License. ansible~=2.10.0a9 -ansible-lint~=4.3.0a6 +ansible-lint~=4.3.1 ansible-runner ansible-runner-http argcomplete diff --git a/roles/catatonit b/roles/catatonit index fc46851..7819178 160000 --- a/roles/catatonit +++ b/roles/catatonit @@ -1 +1 @@ -Subproject commit fc46851031a4041078184d4ef97f8c5655f88f61 +Subproject commit 78191784cb6dee526f7b9108a52ea576ba7a8db1 diff --git a/roles/cvs b/roles/cvs index 6c7f062..64fd91c 160000 --- a/roles/cvs +++ b/roles/cvs @@ -1 +1 @@ -Subproject commit 6c7f06261ccee85f1402079225dfd5401dd31f51 +Subproject commit 64fd91c0cb5f83bb96a9c9347b09178e2ae51fce diff --git a/roles/fisheye b/roles/fisheye index 6cedf23..c8093a9 160000 --- a/roles/fisheye +++ b/roles/fisheye @@ -1 +1 @@ -Subproject commit 6cedf23eb7e786d467a6dd036d83deee7b725b38 +Subproject commit c8093a92b567b1cd0db4fea4a7dfbca6de026985 diff --git a/roles/git b/roles/git index 2de2635..4005349 160000 --- a/roles/git +++ b/roles/git @@ -1 +1 @@ -Subproject commit 2de2635119d57fe1d5133dbf033ae950d4c07856 +Subproject commit 40053498be438ffe5530dd4fcaa9640ec5eba692 diff --git a/roles/gosu b/roles/gosu index 084616d..f6fe1a3 160000 --- a/roles/gosu +++ b/roles/gosu @@ -1 +1 @@ -Subproject commit 084616dda8ee7fd43f355c2b6efa55b5d65064d9 +Subproject commit f6fe1a3c0bc387fafa0e3c37f7ffa92341a44a18 diff --git a/roles/locales b/roles/locales index 68396a1..ea21941 160000 --- a/roles/locales +++ b/roles/locales @@ -1 +1 @@ -Subproject commit 68396a1ecf4122ef64bc0fe79257cd22d7ddb3c1 +Subproject commit ea2194138c316e4caf8093f36f2152f3e031e93a diff --git a/roles/mercurial b/roles/mercurial index 75e9c73..926afc0 160000 --- a/roles/mercurial +++ b/roles/mercurial @@ -1 +1 @@ -Subproject commit 75e9c738cf2bce161cbba27f7e0bd5529c8da20c +Subproject commit 926afc0a5b8f315157b42dadb358adf7b2ca8658 diff --git a/roles/openjdk b/roles/openjdk index 7846a30..bcbdd58 160000 --- a/roles/openjdk +++ b/roles/openjdk @@ -1 +1 @@ -Subproject commit 7846a300c95714e497166c81e08702d413b4bb82 +Subproject commit bcbdd58a19ce471dc4512d51b71a716c65425361 diff --git a/roles/perforce b/roles/perforce index 4dc522a..3c89cc0 160000 --- a/roles/perforce +++ b/roles/perforce @@ -1 +1 @@ -Subproject commit 4dc522ae3dc3b1604f1204b6c52d38d06a040ed0 +Subproject commit 3c89cc0f4d3a3627be24178a586f354376e6c8ec diff --git a/roles/python b/roles/python index 0ecbc2b..2be7660 160000 --- a/roles/python +++ b/roles/python @@ -1 +1 @@ -Subproject commit 0ecbc2b94a8952a820719ab68d68e5f1793c8821 +Subproject commit 2be766020ccb210eef87d488216f827f90402456 diff --git a/roles/svn b/roles/svn index bf245f4..fe4128a 160000 --- a/roles/svn +++ b/roles/svn @@ -1 +1 @@ -Subproject commit bf245f4f50dd6dad203271e3435f0bfaccab1efc +Subproject commit fe4128acd42412be3d1ebd890a368b5a1d7c2443 diff --git a/roles/timezone b/roles/timezone index ca49690..97a637d 160000 --- a/roles/timezone +++ b/roles/timezone @@ -1 +1 @@ -Subproject commit ca496905c89e11d81a5eb1e806e38a3101372988 +Subproject commit 97a637d90e0363079c1147ac82f6946f23f078ab diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 320c892..f929b00 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -41,3 +41,6 @@ curl -skL https://bootstrap.pypa.io/get-pip.py | python3 - --prefix=/usr/local # Install PIP dependencies pip3 install --prefix=/usr/local --upgrade --ignore-installed --requirement requirements.txt + +# Install Ansible Collection dependencies +ansible-galaxy collection install --force --requirements-file ansible-galaxy-requirements.yml From ea4872b9075a5a316b2a824b6cf8f0deae1b446e Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Fri, 21 Aug 2020 16:34:43 +0800 Subject: [PATCH 07/10] https://github.com/ansible/ansible-lint/issues/966 --- .ansible-lint | 2 ++ roles/catatonit | 2 +- roles/cvs | 2 +- roles/fisheye | 2 +- roles/git | 2 +- roles/gosu | 2 +- roles/locales | 2 +- roles/mercurial | 2 +- roles/openjdk | 2 +- roles/perforce | 2 +- roles/python | 2 +- roles/svn | 2 +- roles/timezone | 2 +- 13 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 .ansible-lint diff --git a/.ansible-lint b/.ansible-lint new file mode 100644 index 0000000..5557294 --- /dev/null +++ b/.ansible-lint @@ -0,0 +1,2 @@ +skip_list: + - '106' diff --git a/roles/catatonit b/roles/catatonit index 7819178..29b1d21 160000 --- a/roles/catatonit +++ b/roles/catatonit @@ -1 +1 @@ -Subproject commit 78191784cb6dee526f7b9108a52ea576ba7a8db1 +Subproject commit 29b1d21beb2b5ee22a8bf6919ffcfb0c076243e9 diff --git a/roles/cvs b/roles/cvs index 64fd91c..f558da1 160000 --- a/roles/cvs +++ b/roles/cvs @@ -1 +1 @@ -Subproject commit 64fd91c0cb5f83bb96a9c9347b09178e2ae51fce +Subproject commit f558da1572e3e462f6bdd7a2f9ac9ff7d16e5795 diff --git a/roles/fisheye b/roles/fisheye index c8093a9..81a67be 160000 --- a/roles/fisheye +++ b/roles/fisheye @@ -1 +1 @@ -Subproject commit c8093a92b567b1cd0db4fea4a7dfbca6de026985 +Subproject commit 81a67bed15e75d1911b132d606bb8f8fae1a38c8 diff --git a/roles/git b/roles/git index 4005349..a13016e 160000 --- a/roles/git +++ b/roles/git @@ -1 +1 @@ -Subproject commit 40053498be438ffe5530dd4fcaa9640ec5eba692 +Subproject commit a13016edae7ec4b52bfa5e0d4bde251101b4516d diff --git a/roles/gosu b/roles/gosu index f6fe1a3..c1cd105 160000 --- a/roles/gosu +++ b/roles/gosu @@ -1 +1 @@ -Subproject commit f6fe1a3c0bc387fafa0e3c37f7ffa92341a44a18 +Subproject commit c1cd1055d6e2b6aef40d70b9fc4008a4d63f5d54 diff --git a/roles/locales b/roles/locales index ea21941..02e1cde 160000 --- a/roles/locales +++ b/roles/locales @@ -1 +1 @@ -Subproject commit ea2194138c316e4caf8093f36f2152f3e031e93a +Subproject commit 02e1cdeaf08a2fe3aa2f9faa52a1dcb8bbc3daba diff --git a/roles/mercurial b/roles/mercurial index 926afc0..256a601 160000 --- a/roles/mercurial +++ b/roles/mercurial @@ -1 +1 @@ -Subproject commit 926afc0a5b8f315157b42dadb358adf7b2ca8658 +Subproject commit 256a601453fe8e598937fbdb7c270751e68fcef2 diff --git a/roles/openjdk b/roles/openjdk index bcbdd58..ada42bd 160000 --- a/roles/openjdk +++ b/roles/openjdk @@ -1 +1 @@ -Subproject commit bcbdd58a19ce471dc4512d51b71a716c65425361 +Subproject commit ada42bd1c762ff9c17c3b35438f8633ae8ed9295 diff --git a/roles/perforce b/roles/perforce index 3c89cc0..f0a1189 160000 --- a/roles/perforce +++ b/roles/perforce @@ -1 +1 @@ -Subproject commit 3c89cc0f4d3a3627be24178a586f354376e6c8ec +Subproject commit f0a11893582e7ece0729148f6e73e8c579ecfb3b diff --git a/roles/python b/roles/python index 2be7660..fee3400 160000 --- a/roles/python +++ b/roles/python @@ -1 +1 @@ -Subproject commit 2be766020ccb210eef87d488216f827f90402456 +Subproject commit fee34006ea38633d51c47fae3b3dec161210662f diff --git a/roles/svn b/roles/svn index fe4128a..0a55d5b 160000 --- a/roles/svn +++ b/roles/svn @@ -1 +1 @@ -Subproject commit fe4128acd42412be3d1ebd890a368b5a1d7c2443 +Subproject commit 0a55d5bd7108ac3c97ef9834fbb0132e7202bb0e diff --git a/roles/timezone b/roles/timezone index 97a637d..793a6ed 160000 --- a/roles/timezone +++ b/roles/timezone @@ -1 +1 @@ -Subproject commit 97a637d90e0363079c1147ac82f6946f23f078ab +Subproject commit 793a6ed902081c6139a7dc5ceb9ae25db65b8c96 From 890bb3dfe95d8afe0630b5d3e75ce705c69eedaf Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Tue, 25 Aug 2020 00:19:28 +0800 Subject: [PATCH 08/10] git submodule update --remote --- roles/fisheye | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/fisheye b/roles/fisheye index 81a67be..b7bbfe3 160000 --- a/roles/fisheye +++ b/roles/fisheye @@ -1 +1 @@ -Subproject commit 81a67bed15e75d1911b132d606bb8f8fae1a38c8 +Subproject commit b7bbfe3715e86eec1572676c154166e284c9005f From b2027d6bb5404d0fcfa8645e051e741adeda80bf Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Tue, 25 Aug 2020 10:29:33 +0800 Subject: [PATCH 09/10] https://github.com/hashicorp/vagrant/releases/tag/v2.2.10 --- roles/catatonit | 2 +- roles/cvs | 2 +- roles/fisheye | 2 +- roles/git | 2 +- roles/gosu | 2 +- roles/locales | 2 +- roles/mercurial | 2 +- roles/openjdk | 2 +- roles/perforce | 2 +- roles/python | 2 +- roles/svn | 2 +- roles/timezone | 2 +- scripts/bootstrap-vagrant.sh | 18 +++++++++--------- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/roles/catatonit b/roles/catatonit index 29b1d21..0d032e1 160000 --- a/roles/catatonit +++ b/roles/catatonit @@ -1 +1 @@ -Subproject commit 29b1d21beb2b5ee22a8bf6919ffcfb0c076243e9 +Subproject commit 0d032e1b1f46627b197b91247daaaf70da653daa diff --git a/roles/cvs b/roles/cvs index f558da1..4e45c83 160000 --- a/roles/cvs +++ b/roles/cvs @@ -1 +1 @@ -Subproject commit f558da1572e3e462f6bdd7a2f9ac9ff7d16e5795 +Subproject commit 4e45c837b6946ecb795c0bd4d17192f0157a694d diff --git a/roles/fisheye b/roles/fisheye index b7bbfe3..f92aaa8 160000 --- a/roles/fisheye +++ b/roles/fisheye @@ -1 +1 @@ -Subproject commit b7bbfe3715e86eec1572676c154166e284c9005f +Subproject commit f92aaa89362cce373fc9a0e0595dd41a903e3edd diff --git a/roles/git b/roles/git index a13016e..b0139f0 160000 --- a/roles/git +++ b/roles/git @@ -1 +1 @@ -Subproject commit a13016edae7ec4b52bfa5e0d4bde251101b4516d +Subproject commit b0139f098508be52c21e4d12858010505aabb39f diff --git a/roles/gosu b/roles/gosu index c1cd105..ee0715e 160000 --- a/roles/gosu +++ b/roles/gosu @@ -1 +1 @@ -Subproject commit c1cd1055d6e2b6aef40d70b9fc4008a4d63f5d54 +Subproject commit ee0715ebacb1e4771b9a7c539991815129e3538b diff --git a/roles/locales b/roles/locales index 02e1cde..0837db0 160000 --- a/roles/locales +++ b/roles/locales @@ -1 +1 @@ -Subproject commit 02e1cdeaf08a2fe3aa2f9faa52a1dcb8bbc3daba +Subproject commit 0837db02bd51290e39f95b376e0618fb598dea42 diff --git a/roles/mercurial b/roles/mercurial index 256a601..6886683 160000 --- a/roles/mercurial +++ b/roles/mercurial @@ -1 +1 @@ -Subproject commit 256a601453fe8e598937fbdb7c270751e68fcef2 +Subproject commit 6886683d15c8e95103dba9f42986660d77adcf66 diff --git a/roles/openjdk b/roles/openjdk index ada42bd..847a8b3 160000 --- a/roles/openjdk +++ b/roles/openjdk @@ -1 +1 @@ -Subproject commit ada42bd1c762ff9c17c3b35438f8633ae8ed9295 +Subproject commit 847a8b3eecae3e91572de67d4b83f1089d69757d diff --git a/roles/perforce b/roles/perforce index f0a1189..16c5a97 160000 --- a/roles/perforce +++ b/roles/perforce @@ -1 +1 @@ -Subproject commit f0a11893582e7ece0729148f6e73e8c579ecfb3b +Subproject commit 16c5a97f47f525a763f8c8cd8b8cd8dffa376bc0 diff --git a/roles/python b/roles/python index fee3400..bc8ff2c 160000 --- a/roles/python +++ b/roles/python @@ -1 +1 @@ -Subproject commit fee34006ea38633d51c47fae3b3dec161210662f +Subproject commit bc8ff2c0e27f96b5a33ce8cdb87c59c335d948fb diff --git a/roles/svn b/roles/svn index 0a55d5b..1fbb8da 160000 --- a/roles/svn +++ b/roles/svn @@ -1 +1 @@ -Subproject commit 0a55d5bd7108ac3c97ef9834fbb0132e7202bb0e +Subproject commit 1fbb8da5f382bf424534772650bf7b54a67daf13 diff --git a/roles/timezone b/roles/timezone index 793a6ed..3fdd5a5 160000 --- a/roles/timezone +++ b/roles/timezone @@ -1 +1 @@ -Subproject commit 793a6ed902081c6139a7dc5ceb9ae25db65b8c96 +Subproject commit 3fdd5a5ec06760779ab9250f1698a993db400736 diff --git a/scripts/bootstrap-vagrant.sh b/scripts/bootstrap-vagrant.sh index 1c7fe65..a893859 100755 --- a/scripts/bootstrap-vagrant.sh +++ b/scripts/bootstrap-vagrant.sh @@ -22,27 +22,27 @@ cd "$(cd "$(dirname "$0")"; pwd -P)/../" if [ -x "$(command -v apt-get)" ]; then apt-get update apt-get install -y binutils bridge-utils dnsmasq-base ebtables libvirt-clients libvirt-daemon-system libvirt-dev make qemu-kvm qemu-utils ruby-dev - curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.deb - dpkg -i vagrant_2.2.9_x86_64.deb - rm -rf vagrant_2.2.9_* + curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.deb + dpkg -i vagrant_2.2.10_x86_64.deb + rm -rf vagrant_2.2.10_* fi # Prepare YUM dependencies if [ -x "$(command -v yum)" ]; then yum makecache yum install -y binutils dnsmasq ebtables libvirt libvirt-client libvirt-devel make qemu-img qemu-kvm ruby-devel virt-install - curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.rpm - yum localinstall vagrant_2.2.9_x86_64.rpm - rm -rf vagrant_2.2.9_* + curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.rpm + yum localinstall vagrant_2.2.10_x86_64.rpm + rm -rf vagrant_2.2.10_* fi # Prepare Zypper dependencies if [ -x "$(command -v zypper)" ]; then zypper -n --gpg-auto-import-keys refresh zypper -n install -y binutils-gold bridge-utils dnsmasq ebtables libvirt libvirt-client libvirt-devel make qemu-kvm qemu-tools ruby-devel virt-install - curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.rpm - zypper install vagrant_2.2.9_x86_64.rpm - rm -rf vagrant_2.2.9_* + curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.rpm + zypper install vagrant_2.2.10_x86_64.rpm + rm -rf vagrant_2.2.10_* fi # Install vagrant-libvirt From fa076b103d6f2bd654d54f8278239b11614e5005 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Wed, 26 Aug 2020 10:26:11 +0800 Subject: [PATCH 10/10] git submodule update --remote --- roles/fisheye | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/fisheye b/roles/fisheye index f92aaa8..cff84fd 160000 --- a/roles/fisheye +++ b/roles/fisheye @@ -1 +1 @@ -Subproject commit f92aaa89362cce373fc9a0e0595dd41a903e3edd +Subproject commit cff84fd799010fef51f96f06fc0aad3725c7ea1f