From c599c07bd22b4af0445857b4b540c832b107052c Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Jun 14 2020 19:26:38 +0000 Subject: Merge branch 'cboltz-static-chameleon-3.0' into 'production' static.o.o: add chameleon 3.0 See merge request infra/salt!408 --- diff --git a/pillar/role/static_master.sls b/pillar/role/static_master.sls index 96e0b67..95434f4 100644 --- a/pillar/role/static_master.sls +++ b/pillar/role/static_master.sls @@ -8,7 +8,7 @@ profile: expected_gitmodules: # expected .gitmodules files and their sha256sum # this ensures we notice .gitmodules changes and can update the salt code accordingly - ./static.opensuse.org/.gitmodules: 5d97f0f6b006e16ba39223d7c67c79aad47458f2f3c3408c9d42c503d21fd043 + ./static.opensuse.org/.gitmodules: 4b5edd2bade58ef6d68396213f15ed50074f05c3fd83ad1e87a9fc5c9a063dac ./static.opensuse.org/hosts/www.o.o/.gitmodules: e2da74eed7fcfed7f08669f6bff9d89e0d5f2f02ee8f2c6ad43afe4996cc57f1 git_repos: # branch defaults to 'master' if not specified @@ -33,6 +33,9 @@ profile: static.opensuse.org/chameleon-2.0: branch: rel-2.0 repo: https://github.com/openSUSE/chameleon.git + static.opensuse.org/chameleon-3.0: + branch: rel-3.0 + repo: https://github.com/openSUSE/chameleon.git static.opensuse.org/hosts/www.o.o/searchPage: branch: gh-pages repo: https://github.com/opensuse/searchPage.git