From 9ffb42d448962327b145b3c4422d56e5ae98cec5 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Fri, 14 May 2021 18:23:30 +0800 Subject: [PATCH] Deny jenkins slave pod to remain active for a while (#5225) * Deny jenkins slave pod to remain active for a while Signed-off-by: quicksilver --- .github/workflows/code-checker.yaml | 2 ++ .github/workflows/main.yaml | 2 ++ build/ci/jenkins/Jenkinsfile | 2 +- build/config/topology/trustworthy-jwt.yaml | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/code-checker.yaml b/.github/workflows/code-checker.yaml index 8f0261388..2dcf2c19a 100644 --- a/.github/workflows/code-checker.yaml +++ b/.github/workflows/code-checker.yaml @@ -15,6 +15,7 @@ on: - docker-compose.yml - Makefile - '!**.md' + - '!build/ci/jenkins/**' pull_request: # file paths to consider in the event. Optional; defaults to all. paths: @@ -27,6 +28,7 @@ on: - docker-compose.yml - Makefile - '!**.md' + - '!build/ci/jenkins/**' jobs: ubuntu: diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index f445d10e9..7a98256b2 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -15,6 +15,7 @@ on: - docker-compose.yml - Makefile - '!**.md' + - '!build/ci/jenkins/**' pull_request: # file paths to consider in the event. Optional; defaults to all. paths: @@ -27,6 +28,7 @@ on: - docker-compose.yml - Makefile - '!**.md' + - '!build/ci/jenkins/**' jobs: ubuntu: diff --git a/build/ci/jenkins/Jenkinsfile b/build/ci/jenkins/Jenkinsfile index 908caa4cd..95a6c12bb 100644 --- a/build/ci/jenkins/Jenkinsfile +++ b/build/ci/jenkins/Jenkinsfile @@ -31,7 +31,7 @@ pipeline { customWorkspace '/home/jenkins/agent/workspace' // We allow this pod to remain active for a while, later jobs can // reuse cache in previous created nodes. - idleMinutes 120 + // idleMinutes 120 } } environment { diff --git a/build/config/topology/trustworthy-jwt.yaml b/build/config/topology/trustworthy-jwt.yaml index fe271fbdd..a0e41cb5b 100644 --- a/build/config/topology/trustworthy-jwt.yaml +++ b/build/config/topology/trustworthy-jwt.yaml @@ -4,8 +4,8 @@ apiVersion: kind.x-k8s.io/v1alpha4 networking: ipFamily: "ipv4" kubeProxyMode: "iptables" - podSubnet: "10.245.0.0/16" - serviceSubnet: "10.246.0.0/16" + podSubnet: "10.247.0.0/16" + serviceSubnet: "10.248.0.0/16" nodes: - role: control-plane - role: worker -- GitLab