diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh index 0cfba009..79e9b446 100755 --- a/diskimage-create/diskimage-create.sh +++ b/diskimage-create/diskimage-create.sh @@ -32,7 +32,7 @@ usage() { echo "Usage: $(basename $0)" echo " [-p vanilla|spark|cloudera|storm|mapr|ambari|plain]" echo " [-i ubuntu|fedora|centos|centos7]" - echo " [-v 2.7.1|4|5.0|5.3|5.4|5.5|5.7|2.2.0.0|2.2.1.0]" + echo " [-v 2.7.1|4|5.0|5.3|5.4|5.5|5.7|5.9|2.2.0.0|2.2.1.0]" echo " [-r 5.0.0|5.1.0|5.2.0]" echo " [-s 1.3.1|1.6.0]" echo " [-t 0.9.2|1.0.1]" @@ -173,7 +173,7 @@ case "$PLUGIN" in esac case "$HADOOP_VERSION" in - "" | "5.0" | "5.3" | "5.4" | "5.5" | "5.7");; + "" | "5.0" | "5.3" | "5.4" | "5.5" | "5.7" | "5.9");; *) echo -e "Unknown hadoop version selected.\nAborting" exit 1 @@ -181,8 +181,8 @@ case "$PLUGIN" in esac if [ "$BASE_IMAGE_OS" = "centos7" ]; then - if [ ! -z "$HADOOP_VERSION" -a ! "$HADOOP_VERSION" = "5.5" -a ! "$HADOOP_VERSION" = "5.7" ]; then - echo -e "Unsupported version combination, Centos 7 can only be used with CDH 5.5 and CDH 5.7" + if [ ! -z "$HADOOP_VERSION" -a ! "$HADOOP_VERSION" = "5.5" -a ! "$HADOOP_VERSION" = "5.7" -a ! "$HADOOP_VERSION" = "5.9" ]; then + echo -e "Unsupported version combination, Centos 7 can only be used with CDH 5.5, CDH 5.7 and CDH 5.9" exit 1 fi fi @@ -704,6 +704,14 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then image_create ubuntu $cloudera_5_7_ubuntu_image_name $cloudera_elements_sequence unset DIB_CDH_VERSION DIB_RELEASE fi + if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "5.9" ]; then + cloudera_5_9_ubuntu_image_name=${cloudera_5_9_ubuntu_image_name:-ubuntu_sahara_cloudera_$DIB_CDH_MINOR_VERSION} + + export DIB_CDH_VERSION="5.9" + export DIB_RELEASE="trusty" + image_create ubuntu $cloudera_5_9_ubuntu_image_name $cloudera_elements_sequence + unset DIB_CDH_VERSION DIB_RELEASE + fi fi if [ -z "$BASE_IMAGE_OS" -o "$BASE_IMAGE_OS" = "centos" ]; then @@ -758,6 +766,14 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then cloudera_5_7_centos7_image_name=${cloudera_5_7_centos7_image_name:-centos7_sahara_cloudera_$DIB_CDH_MINOR_VERSION} image_create centos7 $cloudera_5_7_centos7_image_name $cloudera_elements_sequence $centos7_cloudera_elements_sequence + unset DIB_CDH_VERSION + fi + if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "5.9" ]; then + export DIB_CDH_VERSION="5.9" + + cloudera_5_9_centos7_image_name=${cloudera_5_9_centos7_image_name:-centos7_sahara_cloudera_$DIB_CDH_MINOR_VERSION} + image_create centos7 $cloudera_5_9_centos7_image_name $cloudera_elements_sequence $centos7_cloudera_elements_sequence + unset DIB_CDH_VERSION fi fi diff --git a/elements/hadoop-cloudera/install.d/50-install-cloudera b/elements/hadoop-cloudera/install.d/50-install-cloudera index 143ff6a2..91f8b839 100755 --- a/elements/hadoop-cloudera/install.d/50-install-cloudera +++ b/elements/hadoop-cloudera/install.d/50-install-cloudera @@ -65,6 +65,9 @@ case "$DIB_CDH_VERSION" in 5.7) HADOOP_OPENSTACK_5_7_x_URL="https://repository.cloudera.com/artifactory/repo/org/apache/hadoop/hadoop-openstack/2.6.0-cdh$DIB_CDH_MINOR_VERSION/hadoop-openstack-2.6.0-cdh$DIB_CDH_MINOR_VERSION.jar" ;; + 5.9) + HADOOP_OPENSTACK_5_9_x_URL="https://repository.cloudera.com/artifactory/repo/org/apache/hadoop/hadoop-openstack/2.6.0-cdh$DIB_CDH_MINOR_VERSION/hadoop-openstack-2.6.0-cdh$DIB_CDH_MINOR_VERSION.jar" + ;; esac HADOOP_OPENSTACK_5_5_0_URL="https://repository.cloudera.com/artifactory/repo/org/apache/hadoop/hadoop-openstack/2.6.0-cdh5.5.0/hadoop-openstack-2.6.0-cdh5.5.0.jar" HADOOP_OPENSTACK_5_4_0_URL="https://repository.cloudera.com/artifactory/repo/org/apache/hadoop/hadoop-openstack/2.6.0-cdh5.4.0/hadoop-openstack-2.6.0-cdh5.4.0.jar" @@ -106,6 +109,15 @@ case "$DIB_CDH_VERSION" in ln -s /usr/lib/oozie/oozie-sharelib-yarn.tar.gz /usr/lib/oozie/oozie-sharelib.tar.gz fi ;; + 5.9) + wget -O $dest $HADOOP_OPENSTACK_5_9_x_URL + if [ -z "${DIB_CDH_HDFS_ONLY:-}" ]; then + # Create links to keep backward version support. + ln -s /usr/lib/oozie/oozie-sharelib-yarn /usr/lib/oozie/oozie-sharelib-yarn.tar.gz + ln -s /usr/lib/oozie/oozie-sharelib-mr1 /usr/lib/oozie/oozie-sharelib-mr1.tar.gz + ln -s /usr/lib/oozie/oozie-sharelib-yarn.tar.gz /usr/lib/oozie/oozie-sharelib.tar.gz + fi + ;; *) echo "Unhandled version $DIB_CDH_VERSION for hadoop-openstack.jar" exit 1 diff --git a/elements/hadoop-cloudera/pre-install.d/10-add-mirror b/elements/hadoop-cloudera/pre-install.d/10-add-mirror index ca4880b3..0d67297b 100755 --- a/elements/hadoop-cloudera/pre-install.d/10-add-mirror +++ b/elements/hadoop-cloudera/pre-install.d/10-add-mirror @@ -265,6 +265,74 @@ function add_repo_5_7_x { esac } +function add_repo_5_9_x { + case $DISTRO_NAME in + ubuntu ) + # Add repository with postgresql package (it's dependency of cloudera packages) + # Base image doesn't contain this repo + echo -e 'deb http://nova.clouds.archive.ubuntu.com/ubuntu/ trusty universe multiverse main' >> /etc/apt/sources.list + + # Cloudera repositories + echo "deb [arch=amd64] http://archive.cloudera.com/cdh5/ubuntu/trusty/amd64/cdh trusty-cdh$DIB_CDH_MINOR_VERSION contrib" > /etc/apt/sources.list.d/cdh5.list + echo "deb-src http://archive.cloudera.com/cdh5/ubuntu/trusty/amd64/cdh trusty-cdh$DIB_CDH_MINOR_VERSION contrib" >> /etc/apt/sources.list.d/cdh5.list + + wget -qO - http://archive-primary.cloudera.com/cdh5/ubuntu/trusty/amd64/cdh/archive.key | apt-key add - + + echo "deb [arch=amd64] http://archive.cloudera.com/cm5/ubuntu/trusty/amd64/cm trusty-cm$DIB_CDH_MINOR_VERSION contrib" > /etc/apt/sources.list.d/cm5.list + echo "deb-src http://archive.cloudera.com/cm5/ubuntu/trusty/amd64/cm trusty-cm$DIB_CDH_MINOR_VERSION contrib" >> /etc/apt/sources.list.d/cm5.list + + wget -qO - http://archive-primary.cloudera.com/cm5/ubuntu/trusty/amd64/cm/archive.key | apt-key add - + + wget -O /etc/apt/sources.list.d/kms.list http://archive.cloudera.com/navigator-keytrustee5/ubuntu/trusty/amd64/navigator-keytrustee/cloudera.list + wget -qO - http://archive.cloudera.com/navigator-keytrustee5/ubuntu/trusty/amd64/navigator-keytrustee/archive.key | apt-key add - + + # add Kafka repository + echo -e 'deb http://archive.cloudera.com/kafka/ubuntu/trusty/amd64/kafka/ trusty-kafka2.0.2 contrib' >> /etc/apt/sources.list + wget -qO - https://archive.cloudera.com/kafka/ubuntu/trusty/amd64/kafka/archive.key | apt-key add - + + #change repository priority + echo -e 'Package: zookeeper\nPin: origin "archive.cloudera.com"\nPin-Priority: 1001' > /etc/apt/preferences.d/cloudera-pin + + apt-get update + ;; + centos | rhel | centos7 | rhel7 ) + case $DISTRO_NAME in + centos | rhel ) + releasever=6 + ;; + centos7 | rhel7 ) + releasever=7 + ;; + esac + echo '[cloudera-cdh5]' > /etc/yum.repos.d/cloudera-cdh5.repo + echo "name=Cloudera's Distribution for Hadoop, Version 5" >> /etc/yum.repos.d/cloudera-cdh5.repo + echo "baseurl=http://archive.cloudera.com/cdh5/redhat/$releasever/x86_64/cdh/$DIB_CDH_MINOR_VERSION/" >> /etc/yum.repos.d/cloudera-cdh5.repo + echo "gpgkey = http://archive.cloudera.com/cdh5/redhat/$releasever/x86_64/cdh/RPM-GPG-KEY-cloudera" >> /etc/yum.repos.d/cloudera-cdh5.repo + echo 'gpgcheck = 1' >> /etc/yum.repos.d/cloudera-cdh5.repo + + echo '[cloudera-manager]' > /etc/yum.repos.d/cloudera-manager.repo + echo 'name=Cloudera Manager' >> /etc/yum.repos.d/cloudera-manager.repo + echo "baseurl=http://archive.cloudera.com/cm5/redhat/$releasever/x86_64/cm/$DIB_CDH_MINOR_VERSION/" >> /etc/yum.repos.d/cloudera-manager.repo + echo "gpgkey = http://archive.cloudera.com/cm5/redhat/$releasever/x86_64/cm/RPM-GPG-KEY-cloudera" >> /etc/yum.repos.d/cloudera-manager.repo + echo 'gpgcheck = 1' >> /etc/yum.repos.d/cloudera-manager.repo + + echo '[navigator-keytrustee]' > /etc/yum.repos.d/kms.repo + echo "name=Cloudera's Distribution for navigator-Keytrustee, Version 5" >> /etc/yum.repos.d/kms.repo + echo "baseurl=http://archive.cloudera.com/navigator-keytrustee5/redhat/$releasever/x86_64/navigator-keytrustee/$DIB_CDH_MINOR_VERSION/" >> /etc/yum.repos.d/kms.repo + echo "gpgkey = http://archive.cloudera.com/navigator-keytrustee5/redhat/$releasever/x86_64/navigator-keytrustee/RPM-GPG-KEY-cloudera" >> /etc/yum.repos.d/kms.repo + echo 'gpgcheck = 1' >> /etc/yum.repos.d/kms.repo + + echo "[cloudera-kafka]" > /etc/yum.repos.d/cloudera-kafka.repo + echo "name=Cloudera's Distribution for kafka, Version 2.0.2" >> /etc/yum.repos.d/cloudera-kafka.repo + echo "baseurl=http://archive.cloudera.com/kafka/redhat/$releasever/x86_64/kafka/2.0.2/" >> /etc/yum.repos.d/cloudera-kafka.repo + echo "gpgkey = http://archive.cloudera.com/kafka/redhat/$releasever/x86_64/kafka/RPM-GPG-KEY-cloudera" >> /etc/yum.repos.d/cloudera-kafka.repo + echo "gpgcheck = 1" >> /etc/yum.repos.d/cloudera-kafka.repo + + yum clean all + ;; + esac +} + # Call version-specific script to install the desired version of CDH case "$DIB_CDH_VERSION" in 5.0) @@ -287,6 +355,10 @@ case "$DIB_CDH_VERSION" in echo "Installing CDH Version $DIB_CDH_MINOR_VERSION..." add_repo_5_7_x ;; + 5.9) + echo "Installing CDH Version $DIB_CDH_MINOR_VERSION..." + add_repo_5_9_x + ;; *) echo "Invalid CDH Version : $DIB_CDH_VERSION specified, exiting install." exit 1 diff --git a/elements/swift_hadoop/post-install.d/81-add-jar b/elements/swift_hadoop/post-install.d/81-add-jar index 776520a1..9391f97e 100755 --- a/elements/swift_hadoop/post-install.d/81-add-jar +++ b/elements/swift_hadoop/post-install.d/81-add-jar @@ -23,7 +23,7 @@ case "$plugin_type" in hadoop="2.3.0";; "5.3") hadoop="2.5.0";; - "5.4" | "5.5" | "5.7") + "5.4" | "5.5" | "5.7" | "5.9") hadoop="2.6.0";; esac case "$plugin_type" in diff --git a/tools/gate/build-images b/tools/gate/build-images index 407e5175..1d4beb36 100755 --- a/tools/gate/build-images +++ b/tools/gate/build-images @@ -18,7 +18,7 @@ case "$PLUGIN" in # NOTE(vgridnev): Number of versions are growing; testing only 2 latest # releases of CDH # NOTE(mionkin) centos7 is available only for CDH 5.5 and 5.7 - for version in 5.5 5.7; do + for version in 5.7 5.9; do tox -e venv -- sahara-image-create -x -u -p $PLUGIN -i $distro -v $version find . -maxdepth 1 -name '*cloudera*.qcow2' -delete sudo rm -rf ~/.cache/image-create