You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2017/07/01 13:37:21 UTC
[37/50] [abbrv] bigtop git commit: BIGTOP-2814. Make provisioner
config names be consistent with OS names in CI
BIGTOP-2814. Make provisioner config names be consistent with OS names in CI
Signed-off-by: Evans Ye <ev...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/e2a19378
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/e2a19378
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/e2a19378
Branch: refs/heads/branch-1.2
Commit: e2a193784029e7f1eb5da03f77feab004b4f1a35
Parents: 061ca48
Author: Konstantin Boudnik <ko...@epam.com>
Authored: Wed Jun 14 23:55:29 2017 -0700
Committer: Evans Ye <ev...@apache.org>
Committed: Sat Jul 1 12:52:59 2017 +0000
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e2a19378/provisioner/docker/config.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config.yaml b/provisioner/docker/config.yaml
index 776a8f1..19fef16 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
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e2a19378/provisioner/docker/config_centos-6.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_centos-6.yaml b/provisioner/docker/config_centos-6.yaml
new file mode 100644
index 0000000..7912aca
--- /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]
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e2a19378/provisioner/docker/config_centos-7.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_centos-7.yaml b/provisioner/docker/config_centos-7.yaml
new file mode 100644
index 0000000..6cdd7cf
--- /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]
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e2a19378/provisioner/docker/config_centos6.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_centos6.yaml b/provisioner/docker/config_centos6.yaml
deleted file mode 100644
index 7912aca..0000000
--- 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]
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e2a19378/provisioner/docker/config_centos7.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_centos7.yaml b/provisioner/docker/config_centos7.yaml
deleted file mode 100644
index 6cdd7cf..0000000
--- 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]
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e2a19378/provisioner/docker/config_debian-8.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_debian-8.yaml b/provisioner/docker/config_debian-8.yaml
new file mode 100644
index 0000000..c1a468a
--- /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]
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e2a19378/provisioner/docker/config_debian8.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_debian8.yaml b/provisioner/docker/config_debian8.yaml
deleted file mode 100644
index c1a468a..0000000
--- 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]
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e2a19378/provisioner/docker/config_ubuntu_16.04.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_ubuntu_16.04.yaml b/provisioner/docker/config_ubuntu_16.04.yaml
new file mode 100644
index 0000000..54c91f7
--- /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]
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e2a19378/provisioner/docker/config_ubuntu_xenial.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_ubuntu_xenial.yaml b/provisioner/docker/config_ubuntu_xenial.yaml
deleted file mode 100644
index 54c91f7..0000000
--- 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]