From 1f30f57714b7e1dd09af918e14208ff6337d7c59 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Wed, 26 Jul 2017 10:57:06 -0700 Subject: [PATCH] fix jenkins option --- infra/jenkins-cluster/deployment-jenkins.yaml | 4 ++-- infra/jenkins-cluster/server/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infra/jenkins-cluster/deployment-jenkins.yaml b/infra/jenkins-cluster/deployment-jenkins.yaml index d068d957a..6ff526d8b 100644 --- a/infra/jenkins-cluster/deployment-jenkins.yaml +++ b/infra/jenkins-cluster/deployment-jenkins.yaml @@ -12,10 +12,10 @@ spec: spec: containers: - name: jenkins - image: gcr.io/oss-fuzz-base/jenkins:20170726v2 + image: gcr.io/oss-fuzz-base/jenkins:20170726v4 env: - name: JAVA_OPTS - value: "-Duser.timezone=America/Los_Angeles -Dhudson.security.csrf.requestfield=Jenkins-Crumb -Xmx16g" + value: "-Duser.timezone=America/Los_Angeles -Dhudson.security.csrf.requestfield=Jenkins-Crumb -Xmx16g -Djenkins.security.ApiTokenProperty.showTokenToAdmins=true" ports: - containerPort: 8080 - containerPort: 50000 diff --git a/infra/jenkins-cluster/server/Dockerfile b/infra/jenkins-cluster/server/Dockerfile index 983ff0804..c164a0c9a 100644 --- a/infra/jenkins-cluster/server/Dockerfile +++ b/infra/jenkins-cluster/server/Dockerfile @@ -15,5 +15,5 @@ RUN /google-cloud-sdk/bin/gcloud -q components update RUN chown -R jenkins:jenkins /google-cloud-sdk USER jenkins -ENV JENKINS_OPTS --httpPort=8080 --httpsPort=8082 --httpsCertificate=/var/secrets/cert.pem --httpsPrivateKey=/var/secrets/cert.key -Djenkins.security.ApiTokenProperty.showTokenToAdmins=true +ENV JENKINS_OPTS --httpPort=8080 --httpsPort=8082 --httpsCertificate=/var/secrets/cert.pem --httpsPrivateKey=/var/secrets/cert.key ENV PATH=$PATH:/google-cloud-sdk/bin