From 02df7bf3f1425ea03bbd4999ebf927c7402ec9d4 Mon Sep 17 00:00:00 2001 From: Pawel Stankiewicz Date: Thu, 14 Mar 2024 09:10:04 +0100 Subject: [PATCH] ansible: Add jck-azure-ubuntu2204-x64-1 and alpine docker container. EF issue: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4366 Signed-off-by: Pawel Stankiewicz --- .../jenkins/configuration.yml | 32 +++++++++++++++++++ .../target/jenkins/configuration.yml | 32 +++++++++++++++++++ .../target/jenkins/plugins.log | 13 ++++---- .../target/k8s/configmap-jenkins-config.yml | 32 +++++++++++++++++++ 4 files changed, 103 insertions(+), 6 deletions(-) diff --git a/instances/adoptium.temurin-compliance/jenkins/configuration.yml b/instances/adoptium.temurin-compliance/jenkins/configuration.yml index 9bc977056..43d56edc0 100644 --- a/instances/adoptium.temurin-compliance/jenkins/configuration.yml +++ b/instances/adoptium.temurin-compliance/jenkins/configuration.yml @@ -409,6 +409,24 @@ jenkins: sshHostKeyVerificationStrategy: manuallyProvidedKeyVerificationStrategy: key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGnVm//6K2A6I8ZHia8x7TXsd12+jcf0b8036fEtJHtV" + - permanent: + name: "jck-azure-ubuntu2204-x64-1" + nodeDescription: "" + labelString: "ci.role.test hw.arch.x86 sw.os.linux" + remoteFS: '/home/jenkins' + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + ssh: + host: "20.234.51.61" + port: "22" + credentialsId: "jenkins-jck-ssh" + javaPath: + jvmOptions: "-Xmx512m" + sshHostKeyVerificationStrategy: + manuallyProvidedKeyVerificationStrategy: + key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGnVm//6K2A6I8ZHia8x7TXsd12+jcf0b8036fEtJHtV" - permanent: name: "jck-equinix_esxi-solaris10-x64-1" nodeDescription: "" @@ -452,6 +470,20 @@ jenkins: sshHostKeyVerificationStrategy: manuallyTrustedKeyVerificationStrategy: requireInitialManualTrust: true + - permanent: + name: "jck-azure-containerized-alpine317-x64-1" + nodeDescription: "Container host is jck-azure-ubuntu2204-x64-1" + labelString: "ci.role.test hw.arch.x86 sw.os.alpine-linux" + remoteFS: "/home/jenkins" + retentionStrategy: "always" + launcher: + ssh: + credentialsId: "jenkins-jck-ssh" + host: "20.234.51.61" + port: 2222 + sshHostKeyVerificationStrategy: + manuallyTrustedKeyVerificationStrategy: + requireInitialManualTrust: true - permanent: name: "win11-x64-4cpu-5w0uue" nodeDescription: "Windows 11, hosted on Azure, 4vCPU, 16GB RAM, non-burstable" diff --git a/instances/adoptium.temurin-compliance/target/jenkins/configuration.yml b/instances/adoptium.temurin-compliance/target/jenkins/configuration.yml index be77ce45a..7f37f3d32 100644 --- a/instances/adoptium.temurin-compliance/target/jenkins/configuration.yml +++ b/instances/adoptium.temurin-compliance/target/jenkins/configuration.yml @@ -815,6 +815,24 @@ jenkins: sshHostKeyVerificationStrategy: manuallyProvidedKeyVerificationStrategy: key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGnVm//6K2A6I8ZHia8x7TXsd12+jcf0b8036fEtJHtV" + - permanent: + name: "jck-azure-ubuntu2204-x64-1" + nodeDescription: "" + labelString: "ci.role.test hw.arch.x86 sw.os.linux" + remoteFS: '/home/jenkins' + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + ssh: + host: "20.234.51.61" + port: "22" + credentialsId: "jenkins-jck-ssh" + javaPath: + jvmOptions: "-Xmx512m" + sshHostKeyVerificationStrategy: + manuallyProvidedKeyVerificationStrategy: + key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGnVm//6K2A6I8ZHia8x7TXsd12+jcf0b8036fEtJHtV" - permanent: name: "jck-equinix_esxi-solaris10-x64-1" nodeDescription: "" @@ -858,6 +876,20 @@ jenkins: sshHostKeyVerificationStrategy: manuallyTrustedKeyVerificationStrategy: requireInitialManualTrust: true + - permanent: + name: "jck-azure-containerized-alpine317-x64-1" + nodeDescription: "Container host is jck-azure-ubuntu2204-x64-1" + labelString: "ci.role.test hw.arch.x86 sw.os.alpine-linux" + remoteFS: "/home/jenkins" + retentionStrategy: "always" + launcher: + ssh: + credentialsId: "jenkins-jck-ssh" + host: "20.234.51.61" + port: 2222 + sshHostKeyVerificationStrategy: + manuallyTrustedKeyVerificationStrategy: + requireInitialManualTrust: true - permanent: name: "win11-x64-4cpu-5w0uue" nodeDescription: "Windows 11, hosted on Azure, 4vCPU, 16GB RAM, non-burstable" diff --git a/instances/adoptium.temurin-compliance/target/jenkins/plugins.log b/instances/adoptium.temurin-compliance/target/jenkins/plugins.log index fdfbb6221..48d1376e3 100644 --- a/instances/adoptium.temurin-compliance/target/jenkins/plugins.log +++ b/instances/adoptium.temurin-compliance/target/jenkins/plugins.log @@ -5,10 +5,11 @@ ant 497.v94e7d9fffa_b_9 antisamy-markup-formatter 162.v0e6ec0fcfcf6 apache-httpcomponents-client-4-api 4.5.14-208.v438351942757 artifactory 4.0.5 +asm-api 9.6-3.v2e1fa_b_338cd7 authentication-tokens 1.53.v1c90fd9191a_b_ authorize-project 1.7.1 badge 1.9.1 -bootstrap5-api 5.3.2-4 +bootstrap5-api 5.3.3-1 bouncycastle-api 2.30.1.77-225.v26ea_c9455fd9 branch-api 2.1152.v6f101e97dd77 build-timeout 1.32 @@ -29,7 +30,7 @@ data-tables-api 1.13.8-4 display-url-api 2.200.vb_9327d658781 dtkit-api 3.0.2 durable-task 550.v0930093c4b_a_6 -echarts-api 5.4.3-4 +echarts-api 5.5.0-1 email-ext 2.104 embeddable-build-status 467.v4a_954796e45d extended-read-permission 53.v6499940139e5 @@ -55,7 +56,7 @@ handy-uri-templates-2-api 2.1.8-30.v7e777411b_148 http_request 1.18 instance-identity 185.v303dc7c645f9 ionicons-api 56.v1b_1c8c49374e -jackson2-api 2.16.1-373.ve709c6871598 +jackson2-api 2.16.2-378.v7e79818f53ce jakarta-activation-api 2.1.3-1 jakarta-mail-api 2.1.3-1 javadoc 243.vb_b_503b_b_45537 @@ -70,7 +71,7 @@ jobConfigHistory 1229.v3039470161a_d joda-time-api 2.12.7-29.v5a_b_e3a_82269a_ jquery3-api 3.7.1-2 jsch 0.2.16-86.v42e010d9484b_ -json-api 20240205-27.va_007549e895c +json-api 20240303-41.v94e11e6de726 json-path-api 2.9.0-33.v2527142f2e1d junit 1259.v65ffcef24a_88 kubernetes 4186.v1d804571d5d4 @@ -110,7 +111,7 @@ prism-api 1.29.0-13 promoted-builds 945.v597f5c6a_d3fd rebuild 330.v645b_7df10e2a_ resource-disposer 0.23 -scm-api 683.vb_16722fb_b_80b_ +scm-api 689.v237b_6d3a_ef7f script-security 1326.vdb_c154de8669 simple-theme-plugin 176.v39740c03a_a_f5 slack 684.v833089650554 @@ -130,7 +131,7 @@ warnings-ng 11.1.0 workflow-aggregator 596.v8c21c963d92d workflow-api 1291.v51fd2a_625da_7 workflow-basic-steps 1049.v257a_e6b_30fb_d -workflow-cps 3880.vb_ef4b_5cfd270 +workflow-cps 3883.vb_3ff2a_e3eea_f workflow-durable-task-step 1331.vc8c2fed35334 workflow-job 1385.vb_58b_86ea_fff1 workflow-multibranch 773.vc4fe1378f1d5 diff --git a/instances/adoptium.temurin-compliance/target/k8s/configmap-jenkins-config.yml b/instances/adoptium.temurin-compliance/target/k8s/configmap-jenkins-config.yml index fc934fa40..ecc9453cf 100644 --- a/instances/adoptium.temurin-compliance/target/k8s/configmap-jenkins-config.yml +++ b/instances/adoptium.temurin-compliance/target/k8s/configmap-jenkins-config.yml @@ -838,6 +838,24 @@ data: sshHostKeyVerificationStrategy: manuallyProvidedKeyVerificationStrategy: key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGnVm//6K2A6I8ZHia8x7TXsd12+jcf0b8036fEtJHtV" + - permanent: + name: "jck-azure-ubuntu2204-x64-1" + nodeDescription: "" + labelString: "ci.role.test hw.arch.x86 sw.os.linux" + remoteFS: '/home/jenkins' + numExecutors: 1 + mode: EXCLUSIVE + retentionStrategy: "always" + launcher: + ssh: + host: "20.234.51.61" + port: "22" + credentialsId: "jenkins-jck-ssh" + javaPath: + jvmOptions: "-Xmx512m" + sshHostKeyVerificationStrategy: + manuallyProvidedKeyVerificationStrategy: + key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGnVm//6K2A6I8ZHia8x7TXsd12+jcf0b8036fEtJHtV" - permanent: name: "jck-equinix_esxi-solaris10-x64-1" nodeDescription: "" @@ -881,6 +899,20 @@ data: sshHostKeyVerificationStrategy: manuallyTrustedKeyVerificationStrategy: requireInitialManualTrust: true + - permanent: + name: "jck-azure-containerized-alpine317-x64-1" + nodeDescription: "Container host is jck-azure-ubuntu2204-x64-1" + labelString: "ci.role.test hw.arch.x86 sw.os.alpine-linux" + remoteFS: "/home/jenkins" + retentionStrategy: "always" + launcher: + ssh: + credentialsId: "jenkins-jck-ssh" + host: "20.234.51.61" + port: 2222 + sshHostKeyVerificationStrategy: + manuallyTrustedKeyVerificationStrategy: + requireInitialManualTrust: true - permanent: name: "win11-x64-4cpu-5w0uue" nodeDescription: "Windows 11, hosted on Azure, 4vCPU, 16GB RAM, non-burstable"