Skip to content

Commit a61cea1

Browse files
committed
feat: upgrade jenkins 12055
1 parent 8c79f2e commit a61cea1

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
tests:
1111
runs-on: ubuntu-20.04
1212
env:
13-
JENKINS_VERSION: 'jenkins_2.303.3'
13+
JENKINS_VERSION: 'jenkins_2.319.3'
1414
BOKCHOY_HEADLESS: true
1515
CI_SYSTEM: 'GitHub_CI'
1616
CONFIG_PATH: 'test_data'
@@ -31,8 +31,8 @@ jobs:
3131
- name: Install Firefox 69
3232
run: |
3333
sudo apt-get purge firefox
34-
wget "https://ftp.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-US/firefox-69.0.tar.bz2"
35-
tar -xjf firefox-69.0.tar.bz2
34+
wget "https://ftp.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/en-US/firefox-82.0.tar.bz2"
35+
tar -xjf firefox-82.0.tar.bz2
3636
sudo mv firefox /opt/firefox
3737
sudo ln -s /opt/firefox/firefox /usr/bin/firefox
3838

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FROM ubuntu:20.04 as base
1111

1212
USER root
1313
RUN apt-get update -y \
14-
&& apt-get install -y openjdk-8-jdk \
14+
&& apt-get install -y openjdk-11-jdk \
1515
&& apt-get install -y curl \
1616
&& apt-get install -y git \
1717
&& apt-get install -y sudo \
@@ -32,7 +32,7 @@ RUN mkdir /usr/share/jenkins \
3232
-L -o /usr/share/jenkins/jenkins.war
3333
EXPOSE 8080
3434
ENV JENKINS_HOME /var/lib/jenkins
35-
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
35+
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
3636

3737
ARG CONFIG_PATH
3838
ENV JENKINS_CONFIG_PATH $JENKINS_HOME/init-configs

local_env.sh.sample

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export PLUGIN_CONFIG='test_data/plugins.yml'
1212
# change this variable
1313
export JENKINS_WAR_SOURCE='https://s3.amazonaws.com/edx-testeng-tools/jenkins'
1414

15-
export JENKINS_VERSION='jenkins_2.303.3'
15+
export JENKINS_VERSION='jenkins_2.319.3'
1616
export CONTAINER_NAME='jenkins'
1717
export IMAGE_NAME='localjenkins'
1818

0 commit comments

Comments
 (0)