aboutsummaryrefslogtreecommitdiffhomepage
path: root/jenkins
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2016-07-21 18:04:56 -0700
committerGravatar Feng Xiao <xfxyjwf@gmail.com>2016-07-21 18:11:12 -0700
commit20fbb357d013b9c2143031cc843ce066307a37ad (patch)
treeba4a00ea83694670ef427f8f729441dc4e5566f2 /jenkins
parent2ba058c66c10781d57a332987be23e3fed0f9e1c (diff)
Add more tests to jenkins.
1. Added ruby22 and jruby tests to jenkins. 2. Added javascript tests to jenkins. 3. Added golang tests to jenkins. 4. Removed ruby19/ruby20 tests from travis. Support for ruby 2.0 has ended since 2016/02/24. https://www.ruby-lang.org/en/news/2016/02/24/support-plan-of-ruby-2-0-0-and-2-1/ Change-Id: Ie984b06772335352a4be7067ab2485f923875685
Diffstat (limited to 'jenkins')
-rw-r--r--jenkins/docker/Dockerfile26
-rwxr-xr-xjenkins/pull_request_in_docker.sh4
2 files changed, 24 insertions, 6 deletions
diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile
index c928ac71..53ac38f3 100644
--- a/jenkins/docker/Dockerfile
+++ b/jenkins/docker/Dockerfile
@@ -87,7 +87,6 @@ RUN wget www.nuget.org/NuGet.exe -O /usr/local/bin/nuget.exe
RUN pip install pip --upgrade
RUN pip install virtualenv tox yattag
-
##################
# Ruby dependencies
@@ -95,12 +94,12 @@ RUN pip install virtualenv tox yattag
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
RUN \curl -sSL https://get.rvm.io | bash -s stable
-# Install Ruby 2.1
+# Install Ruby 2.1, Ruby 2.2 and JRuby 1.7
RUN /bin/bash -l -c "rvm install ruby-2.1"
-RUN /bin/bash -l -c "rvm use --default ruby-2.1"
+RUN /bin/bash -l -c "rvm install ruby-2.2"
+RUN /bin/bash -l -c "rvm install jruby-1.7"
RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
-RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc"
RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
##################
@@ -118,12 +117,29 @@ RUN cd /tmp && \
./configure && \
make -j6 && \
cd java && \
- $MVN install dependency:go-offline -Dmaven.repo.local=$MAVEN_REPO -P lite && \
$MVN install dependency:go-offline -Dmaven.repo.local=$MAVEN_REPO && \
cd ../javanano && \
$MVN install dependency:go-offline -Dmaven.repo.local=$MAVEN_REPO
##################
+# Go dependencies.
+RUN apt-get install -y \
+ # -- For go -- \
+ golang
+
+##################
+# Javascript dependencies.
+Run apt-get install -y \
+ # -- For javascript -- \
+ npm
+
+# On Debian/Ubuntu, nodejs binary is named 'nodejs' because the name 'node'
+# is taken by another legacy binary. We don't have that legacy binary and
+# npm expects the binary to be named 'node', so we just create a symbol
+# link here.
+RUN ln -s `which nodejs` /usr/bin/node
+
+##################
# Prepare ccache
RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
diff --git a/jenkins/pull_request_in_docker.sh b/jenkins/pull_request_in_docker.sh
index 887f97c5..78a9253a 100755
--- a/jenkins/pull_request_in_docker.sh
+++ b/jenkins/pull_request_in_docker.sh
@@ -55,7 +55,9 @@ parallel --results $LOG_OUTPUT_DIR --joblog $OUTPUT_DIR/joblog $TEST_SCRIPT :::
javanano_oracle7 \
python \
python_cpp \
- ruby21 \
+ ruby_all \
+ javascript \
+ golang \
|| true # Process test results even if tests fail.
cat $OUTPUT_DIR/joblog