From c6b60a81e4cbb5adf2a6659553dc76ec91feed4e Mon Sep 17 00:00:00 2001 From: Konstantin Boudnik Date: Wed, 14 Jun 2017 23:55:29 -0700 Subject: BIGTOP-2814. Make provisioner config names be consistent with OS names in CI Signed-off-by: Evans Ye --- provisioner/docker/config.yaml | 2 +- provisioner/docker/config_centos-6.yaml | 24 ++++++++++++++++++++++++ provisioner/docker/config_centos-7.yaml | 24 ++++++++++++++++++++++++ provisioner/docker/config_centos6.yaml | 24 ------------------------ provisioner/docker/config_centos7.yaml | 24 ------------------------ provisioner/docker/config_debian-8.yaml | 24 ++++++++++++++++++++++++ provisioner/docker/config_debian8.yaml | 24 ------------------------ provisioner/docker/config_ubuntu_16.04.yaml | 24 ++++++++++++++++++++++++ provisioner/docker/config_ubuntu_xenial.yaml | 24 ------------------------ 9 files changed, 97 insertions(+), 97 deletions(-) create mode 100644 provisioner/docker/config_centos-6.yaml create mode 100644 provisioner/docker/config_centos-7.yaml delete mode 100644 provisioner/docker/config_centos6.yaml delete mode 100644 provisioner/docker/config_centos7.yaml create mode 100644 provisioner/docker/config_debian-8.yaml delete mode 100644 provisioner/docker/config_debian8.yaml create mode 100644 provisioner/docker/config_ubuntu_16.04.yaml delete mode 100644 provisioner/docker/config_ubuntu_xenial.yaml diff --git a/provisioner/docker/config.yaml b/provisioner/docker/config.yaml index 776a8f1f..19fef164 120000 --- a/provisioner/docker/config.yaml +++ b/provisioner/docker/config.yaml @@ -1 +1 @@ -config_centos7.yaml \ No newline at end of file +config_centos-7.yaml \ No newline at end of file diff --git a/provisioner/docker/config_centos-6.yaml b/provisioner/docker/config_centos-6.yaml new file mode 100644 index 00000000..7912aca6 --- /dev/null +++ b/provisioner/docker/config_centos-6.yaml @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +docker: + memory_limit: "4g" + image: "bigtop/puppet:centos-6" + +repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/centos/6/x86_64" +distro: centos +components: [hdfs, yarn, mapreduce] +enable_local_repo: false +smoke_test_components: [hdfs, yarn, mapreduce] diff --git a/provisioner/docker/config_centos-7.yaml b/provisioner/docker/config_centos-7.yaml new file mode 100644 index 00000000..6cdd7cfc --- /dev/null +++ b/provisioner/docker/config_centos-7.yaml @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +docker: + memory_limit: "4g" + image: "bigtop/puppet:centos-7" + +repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/centos/7/x86_64" +distro: centos +components: [hdfs, yarn, mapreduce] +enable_local_repo: false +smoke_test_components: [hdfs, yarn, mapreduce] diff --git a/provisioner/docker/config_centos6.yaml b/provisioner/docker/config_centos6.yaml deleted file mode 100644 index 7912aca6..00000000 --- a/provisioner/docker/config_centos6.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -docker: - memory_limit: "4g" - image: "bigtop/puppet:centos-6" - -repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/centos/6/x86_64" -distro: centos -components: [hdfs, yarn, mapreduce] -enable_local_repo: false -smoke_test_components: [hdfs, yarn, mapreduce] diff --git a/provisioner/docker/config_centos7.yaml b/provisioner/docker/config_centos7.yaml deleted file mode 100644 index 6cdd7cfc..00000000 --- a/provisioner/docker/config_centos7.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -docker: - memory_limit: "4g" - image: "bigtop/puppet:centos-7" - -repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/centos/7/x86_64" -distro: centos -components: [hdfs, yarn, mapreduce] -enable_local_repo: false -smoke_test_components: [hdfs, yarn, mapreduce] diff --git a/provisioner/docker/config_debian-8.yaml b/provisioner/docker/config_debian-8.yaml new file mode 100644 index 00000000..c1a468a4 --- /dev/null +++ b/provisioner/docker/config_debian-8.yaml @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +docker: + memory_limit: "4g" + image: "bigtop/puppet:debian-8" + +repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/debian/8/x86_64" +distro: debian +components: [hdfs, yarn, mapreduce] +enable_local_repo: false +smoke_test_components: [hdfs, yarn, mapreduce] diff --git a/provisioner/docker/config_debian8.yaml b/provisioner/docker/config_debian8.yaml deleted file mode 100644 index c1a468a4..00000000 --- a/provisioner/docker/config_debian8.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -docker: - memory_limit: "4g" - image: "bigtop/puppet:debian-8" - -repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/debian/8/x86_64" -distro: debian -components: [hdfs, yarn, mapreduce] -enable_local_repo: false -smoke_test_components: [hdfs, yarn, mapreduce] diff --git a/provisioner/docker/config_ubuntu_16.04.yaml b/provisioner/docker/config_ubuntu_16.04.yaml new file mode 100644 index 00000000..54c91f77 --- /dev/null +++ b/provisioner/docker/config_ubuntu_16.04.yaml @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +docker: + memory_limit: "4g" + image: "bigtop/puppet:ubuntu-16.04" + +repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/ubuntu/16.04/x86_64" +distro: debian +components: [hdfs, yarn, mapreduce] +enable_local_repo: false +smoke_test_components: [hdfs, yarn, mapreduce] diff --git a/provisioner/docker/config_ubuntu_xenial.yaml b/provisioner/docker/config_ubuntu_xenial.yaml deleted file mode 100644 index 54c91f77..00000000 --- a/provisioner/docker/config_ubuntu_xenial.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -docker: - memory_limit: "4g" - image: "bigtop/puppet:ubuntu-16.04" - -repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/ubuntu/16.04/x86_64" -distro: debian -components: [hdfs, yarn, mapreduce] -enable_local_repo: false -smoke_test_components: [hdfs, yarn, mapreduce] -- cgit v1.2.3