Decommission skytap AIX 7.1 machines

EF issue: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4285 Signed-off-by: Pawel Stankiewicz <[email protected]>
eclipse-cbi · Feb 20, 2024 · 738c84d · 738c84d
1 parent fdcdf79
commit 738c84d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 143 deletions.
diff --git a/instances/adoptium.temurin-compliance/jenkins/configuration.yml b/instances/adoptium.temurin-compliance/jenkins/configuration.yml
@@ -235,42 +235,6 @@ jenkins:
           env:
           - key: "PATH+USR_LOCAL_BIN"
             value: "/usr/local/bin:/opt/homebrew/bin:/opt/X11/bin"
-  - permanent:
-      name: "jck-skytap-aix71-ppc64-1"
-      nodeDescription: "AIX 7.1 machine hosted by Skytap"
-      labelString: "ci.role.test hw.arch.ppc64 sw.os.aix"
-      remoteFS: '/home/jenkins'
-      numExecutors: 1
-      mode: EXCLUSIVE
-      retentionStrategy: "always"
-      launcher:
-        ssh:
-          host: "20.61.136.211"
-          port: "22"
-          credentialsId: "jenkins-jck-ssh"
-          javaPath: "/usr/jdk-11.0.11+9/bin/java"
-          jvmOptions: "-Xmx1g"
-          sshHostKeyVerificationStrategy:
-            manuallyProvidedKeyVerificationStrategy:
-              key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSnnvGjC0hFBQ7AMf+7Fv+UrXYMvG5ngN3wbPt3ABZ7wSfaHlll2+2N6NSWChTVahWQCFoDWQy1TyzvjRZq69gdaDW7voIa1lglns0hFRt6FTNEtZyVU1bJ4ugbRfvpP4OjH1SSTww3UqBEmvv215tU1sdHfIJKNWWRo0hbgQS8QGBtDF8pDK68CCquXMV62JbBUzRa3bE+OdoLL37m57mBlWLUG4t7O26F758vAdwXn9jzovc9CQdki2jfkRTK/OsrwaHHyOheqjBGFE9HFJ7J8HyRlXvRQi0EHp9f5vDwERzDhbEJy2RZ+KDZ4qnL/HCKpKaS/K107jSkbElAAHV"
-  - permanent:
-      name: "jck-skytap-aix71-ppc64-2"
-      nodeDescription: "AIX 7.1 machine hosted by Skytap"
-      labelString: "ci.role.test hw.arch.ppc64 sw.os.aix"
-      remoteFS: '/home/jenkins'
-      numExecutors: 1
-      mode: EXCLUSIVE
-      retentionStrategy: "always"
-      launcher:
-        ssh:
-          host: "20.61.136.213"
-          port: "22"
-          credentialsId: "jenkins-jck-ssh"
-          javaPath: "/usr/jdk-11.0.17+8/bin/java"
-          jvmOptions: "-Xmx1g"
-          sshHostKeyVerificationStrategy:
-            manuallyProvidedKeyVerificationStrategy:
-              key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSnnvGjC0hFBQ7AMf+7Fv+UrXYMvG5ngN3wbPt3ABZ7wSfaHlll2+2N6NSWChTVahWQCFoDWQy1TyzvjRZq69gdaDW7voIa1lglns0hFRt6FTNEtZyVU1bJ4ugbRfvpP4OjH1SSTww3UqBEmvv215tU1sdHfIJKNWWRo0hbgQS8QGBtDF8pDK68CCquXMV62JbBUzRa3bE+OdoLL37m57mBlWLUG4t7O26F758vAdwXn9jzovc9CQdki2jfkRTK/OsrwaHHyOheqjBGFE9HFJ7J8HyRlXvRQi0EHp9f5vDwERzDhbEJy2RZ+KDZ4qnL/HCKpKaS/K107jSkbElAAHV"
   - permanent:
       name: "jck-skytap-aix72-ppc64-3"
       nodeDescription: "AIX 7.2 machine hosted by Skytap"

diff --git a/instances/adoptium.temurin-compliance/target/config.json b/instances/adoptium.temurin-compliance/target/config.json
@@ -20,13 +20,7 @@
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
                   "aliases": [
-                     "docker.io/eclipsecbi/jiro-agent-basic:latest",
-                     "docker.io/eclipsecbijenkins/basic-agent:3160.vd76b_9ddd10cc",
-                     "docker.io/eclipsecbijenkins/jenkins-agent:3160.vd76b_9ddd10cc",
-                     "docker.io/eclipsecbi/jenkins-jnlp-agent:3160.vd76b_9ddd10cc",
-                     "docker.io/eclipsecbijenkins/basic-agent:latest",
-                     "docker.io/eclipsecbijenkins/jenkins-agent:latest",
-                     "docker.io/eclipsecbi/jenkins-jnlp-agent:latest"
+                     "docker.io/eclipsecbi/jiro-agent-basic:latest"
                   ],
                   "context": "basic",
                   "dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-basic:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\", ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n    && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n  && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n  && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n  && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nUSER 10001:0\n",
@@ -216,15 +210,7 @@
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {
                   "aliases": [
-                     "docker.io/eclipsecbi/jiro-agent-centos-7:latest",
-                     "docker.io/eclipsecbijenkins/jipp-migration-agent:3160.vd76b_9ddd10cc",
-                     "docker.io/eclipsecbijenkins/migration-fat-agent:3160.vd76b_9ddd10cc",
-                     "docker.io/eclipsecbijenkins/ui-test-agent:3160.vd76b_9ddd10cc",
-                     "docker.io/eclipsecbijenkins/ui-tests-agent:3160.vd76b_9ddd10cc",
-                     "docker.io/eclipsecbijenkins/jipp-migration-agent:latest",
-                     "docker.io/eclipsecbijenkins/migration-fat-agent:latest",
-                     "docker.io/eclipsecbijenkins/ui-test-agent:latest",
-                     "docker.io/eclipsecbijenkins/ui-tests-agent:latest"
+                     "docker.io/eclipsecbi/jiro-agent-centos-7:latest"
                   ],
                   "context": "centos-7",
                   "dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-centos-7:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\", ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n    && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n  && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n  && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n  && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nUSER 10001:0\n",

diff --git a/instances/adoptium.temurin-compliance/target/jenkins/configuration.yml b/instances/adoptium.temurin-compliance/target/jenkins/configuration.yml
@@ -641,42 +641,6 @@ jenkins:
               env:
                 - key: "PATH+USR_LOCAL_BIN"
                   value: "/usr/local/bin:/opt/homebrew/bin:/opt/X11/bin"
-    - permanent:
-        name: "jck-skytap-aix71-ppc64-1"
-        nodeDescription: "AIX 7.1 machine hosted by Skytap"
-        labelString: "ci.role.test hw.arch.ppc64 sw.os.aix"
-        remoteFS: '/home/jenkins'
-        numExecutors: 1
-        mode: EXCLUSIVE
-        retentionStrategy: "always"
-        launcher:
-          ssh:
-            host: "20.61.136.211"
-            port: "22"
-            credentialsId: "jenkins-jck-ssh"
-            javaPath: "/usr/jdk-11.0.11+9/bin/java"
-            jvmOptions: "-Xmx1g"
-            sshHostKeyVerificationStrategy:
-              manuallyProvidedKeyVerificationStrategy:
-                key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSnnvGjC0hFBQ7AMf+7Fv+UrXYMvG5ngN3wbPt3ABZ7wSfaHlll2+2N6NSWChTVahWQCFoDWQy1TyzvjRZq69gdaDW7voIa1lglns0hFRt6FTNEtZyVU1bJ4ugbRfvpP4OjH1SSTww3UqBEmvv215tU1sdHfIJKNWWRo0hbgQS8QGBtDF8pDK68CCquXMV62JbBUzRa3bE+OdoLL37m57mBlWLUG4t7O26F758vAdwXn9jzovc9CQdki2jfkRTK/OsrwaHHyOheqjBGFE9HFJ7J8HyRlXvRQi0EHp9f5vDwERzDhbEJy2RZ+KDZ4qnL/HCKpKaS/K107jSkbElAAHV"
-    - permanent:
-        name: "jck-skytap-aix71-ppc64-2"
-        nodeDescription: "AIX 7.1 machine hosted by Skytap"
-        labelString: "ci.role.test hw.arch.ppc64 sw.os.aix"
-        remoteFS: '/home/jenkins'
-        numExecutors: 1
-        mode: EXCLUSIVE
-        retentionStrategy: "always"
-        launcher:
-          ssh:
-            host: "20.61.136.213"
-            port: "22"
-            credentialsId: "jenkins-jck-ssh"
-            javaPath: "/usr/jdk-11.0.17+8/bin/java"
-            jvmOptions: "-Xmx1g"
-            sshHostKeyVerificationStrategy:
-              manuallyProvidedKeyVerificationStrategy:
-                key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSnnvGjC0hFBQ7AMf+7Fv+UrXYMvG5ngN3wbPt3ABZ7wSfaHlll2+2N6NSWChTVahWQCFoDWQy1TyzvjRZq69gdaDW7voIa1lglns0hFRt6FTNEtZyVU1bJ4ugbRfvpP4OjH1SSTww3UqBEmvv215tU1sdHfIJKNWWRo0hbgQS8QGBtDF8pDK68CCquXMV62JbBUzRa3bE+OdoLL37m57mBlWLUG4t7O26F758vAdwXn9jzovc9CQdki2jfkRTK/OsrwaHHyOheqjBGFE9HFJ7J8HyRlXvRQi0EHp9f5vDwERzDhbEJy2RZ+KDZ4qnL/HCKpKaS/K107jSkbElAAHV"
     - permanent:
         name: "jck-skytap-aix72-ppc64-3"
         nodeDescription: "AIX 7.2 machine hosted by Skytap"

diff --git a/instances/adoptium.temurin-compliance/target/jenkins/plugins.log b/instances/adoptium.temurin-compliance/target/jenkins/plugins.log
@@ -4,13 +4,13 @@ analysis-model-api 11.15.0
 ant 497.v94e7d9fffa_b_9
 antisamy-markup-formatter 162.v0e6ec0fcfcf6
 apache-httpcomponents-client-4-api 4.5.14-208.v438351942757
-artifactory 4.0.3
+artifactory 4.0.4
 authentication-tokens 1.53.v1c90fd9191a_b_
 authorize-project 1.7.1
 badge 1.9.1
 bootstrap5-api 5.3.2-3
 bouncycastle-api 2.30.1.77-225.v26ea_c9455fd9
-branch-api 2.1144.v1425d1c3d5a_7
+branch-api 2.1148.vce12cfcdf090
 build-timeout 1.32
 build-user-vars-plugin 1.9
 build-with-parameters 76.v9382db_f78962
@@ -23,12 +23,12 @@ commons-text-api 1.11.0-95.v22a_d30ee5d36
 config-file-provider 968.ve1ca_eb_913f8c
 configuration-as-code 1775.v810dc950b_514
 copyartifact 722.v0662a_9b_e22a_c
-credentials 1311.vcf0a_900b_37c2
+credentials 1319.v7eb_51b_3a_c97b_
 credentials-binding 657.v2b_19db_7d6e6d
 data-tables-api 1.13.8-2
 display-url-api 2.200.vb_9327d658781
 dtkit-api 3.0.2
-durable-task 543.v262f6a_803410
+durable-task 550.v0930093c4b_a_6
 echarts-api 5.4.3-2
 email-ext 2.104
 embeddable-build-status 467.v4a_954796e45d
@@ -37,7 +37,7 @@ external-monitor-job 215.v2e88e894db_f8
 extra-columns 1.26
 font-awesome-api 6.5.1-2
 forensics-api 2.3.0
-generic-webhook-trigger 1.88.2
+generic-webhook-trigger 2.0.0
 ghprb 1.42.2
 git 5.2.1
 git-client 4.6.0
@@ -46,9 +46,9 @@ github 1.37.3.1
 github-api 1.318-461.v7a_c09c9fa_d63
 github-branch-source 1772.va_69eda_d018d4
 gitlab-api 5.3.0-91.v1f9a_fda_d654f
-gitlab-branch-source 688.v5fa_356ee8520
+gitlab-branch-source 694.v1b_045877a_b_92
 gitlab-plugin 1.8.0
-gradle 2.9
+gradle 2.10
 groovy-postbuild 228.vcdb_cf7265066
 gson-api 2.10.1-15.v0d99f670e0a_7
 handy-uri-templates-2-api 2.1.8-30.v7e777411b_148
@@ -72,29 +72,29 @@ jquery3-api 3.7.1-1
 jsch 0.2.16-86.v42e010d9484b_
 json-api 20231013-17.v1c97069404b_e
 json-path-api 2.9.0-33.v2527142f2e1d
-junit 1256.v002534a_5f33e
+junit 1259.v65ffcef24a_88
 kubernetes 4179.v3b_88431df708
-kubernetes-client-api 6.9.2-239.ve49a_3f285167
+kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2
 kubernetes-credentials 0.11
 ldap 711.vb_d1a_491714dc
 mailer 463.vedf8358e006b_
 matrix-auth 3.2.1
 matrix-project 822.824.v14451b_c0fd42
 maven-plugin 3.23
-metrics 4.2.18-442.v02e107157925
+metrics 4.2.21-449.v6960d7c54c69
 mina-sshd-api-common 2.12.0-90.v9f7fb_9fa_3d3b_
 mina-sshd-api-core 2.12.0-90.v9f7fb_9fa_3d3b_
-monitoring 1.95.0
+monitoring 1.98.0
 okhttp-api 4.11.0-157.v6852a_a_fa_ec11
 pam-auth 1.10
-parameter-separator 129.v86b_98b_cb_5274
+parameter-separator 166.vd0120849b_386
 parameterized-trigger 787.v665fcf2a_830b_
 pipeline-build-step 540.vb_e8849e1a_b_d8
 pipeline-graph-analysis 202.va_d268e64deb_3
 pipeline-groovy-lib 704.vc58b_8890a_384
 pipeline-input-step 477.v339683a_8d55e
-pipeline-maven 1368.vfb_8509d7b_869
-pipeline-maven-api 1368.vfb_8509d7b_869
+pipeline-maven 1376.v18876d10ce9c
+pipeline-maven-api 1376.v18876d10ce9c
 pipeline-milestone-step 111.v449306f708b_7
 pipeline-model-api 2.2175.v76a_fff0a_2618
 pipeline-model-definition 2.2175.v76a_fff0a_2618
@@ -103,15 +103,15 @@ pipeline-rest-api 2.34
 pipeline-stage-step 305.ve96d0205c1c6
 pipeline-stage-tags-metadata 2.2175.v76a_fff0a_2618
 pipeline-stage-view 2.34
-pipeline-utility-steps 2.16.1
+pipeline-utility-steps 2.16.2
 plain-credentials 143.v1b_df8b_d3b_e48
 plugin-util-api 3.8.0
 prism-api 1.29.0-10
 promoted-builds 945.v597f5c6a_d3fd
 rebuild 330.v645b_7df10e2a_
 resource-disposer 0.23
 scm-api 683.vb_16722fb_b_80b_
-script-security 1313.v7a_6067dc7087
+script-security 1326.vdb_c154de8669
 simple-theme-plugin 176.v39740c03a_a_f5
 slack 684.v833089650554
 snakeyaml-api 2.2-111.vc6598e30cc65
@@ -127,10 +127,10 @@ trilead-api 2.133.vfb_8a_7b_9c5dd1
 variant 60.v7290fc0eb_b_cd
 warnings-ng 10.7.0
 workflow-aggregator 596.v8c21c963d92d
-workflow-api 1283.v99c10937efcb_
+workflow-api 1291.v51fd2a_625da_7
 workflow-basic-steps 1042.ve7b_140c4a_e0c
-workflow-cps 3853.vb_a_490d892963
-workflow-durable-task-step 1317.v5337e0c1fe28
+workflow-cps 3867.v535458ce43fd
+workflow-durable-task-step 1331.vc8c2fed35334
 workflow-job 1385.vb_58b_86ea_fff1
 workflow-multibranch 773.vc4fe1378f1d5
 workflow-scm-step 415.v434365564324

diff --git a/instances/adoptium.temurin-compliance/target/k8s/configmap-jenkins-config.yml b/instances/adoptium.temurin-compliance/target/k8s/configmap-jenkins-config.yml
@@ -664,42 +664,6 @@ data:
                   env:
                     - key: "PATH+USR_LOCAL_BIN"
                       value: "/usr/local/bin:/opt/homebrew/bin:/opt/X11/bin"
-        - permanent:
-            name: "jck-skytap-aix71-ppc64-1"
-            nodeDescription: "AIX 7.1 machine hosted by Skytap"
-            labelString: "ci.role.test hw.arch.ppc64 sw.os.aix"
-            remoteFS: '/home/jenkins'
-            numExecutors: 1
-            mode: EXCLUSIVE
-            retentionStrategy: "always"
-            launcher:
-              ssh:
-                host: "20.61.136.211"
-                port: "22"
-                credentialsId: "jenkins-jck-ssh"
-                javaPath: "/usr/jdk-11.0.11+9/bin/java"
-                jvmOptions: "-Xmx1g"
-                sshHostKeyVerificationStrategy:
-                  manuallyProvidedKeyVerificationStrategy:
-                    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSnnvGjC0hFBQ7AMf+7Fv+UrXYMvG5ngN3wbPt3ABZ7wSfaHlll2+2N6NSWChTVahWQCFoDWQy1TyzvjRZq69gdaDW7voIa1lglns0hFRt6FTNEtZyVU1bJ4ugbRfvpP4OjH1SSTww3UqBEmvv215tU1sdHfIJKNWWRo0hbgQS8QGBtDF8pDK68CCquXMV62JbBUzRa3bE+OdoLL37m57mBlWLUG4t7O26F758vAdwXn9jzovc9CQdki2jfkRTK/OsrwaHHyOheqjBGFE9HFJ7J8HyRlXvRQi0EHp9f5vDwERzDhbEJy2RZ+KDZ4qnL/HCKpKaS/K107jSkbElAAHV"
-        - permanent:
-            name: "jck-skytap-aix71-ppc64-2"
-            nodeDescription: "AIX 7.1 machine hosted by Skytap"
-            labelString: "ci.role.test hw.arch.ppc64 sw.os.aix"
-            remoteFS: '/home/jenkins'
-            numExecutors: 1
-            mode: EXCLUSIVE
-            retentionStrategy: "always"
-            launcher:
-              ssh:
-                host: "20.61.136.213"
-                port: "22"
-                credentialsId: "jenkins-jck-ssh"
-                javaPath: "/usr/jdk-11.0.17+8/bin/java"
-                jvmOptions: "-Xmx1g"
-                sshHostKeyVerificationStrategy:
-                  manuallyProvidedKeyVerificationStrategy:
-                    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSnnvGjC0hFBQ7AMf+7Fv+UrXYMvG5ngN3wbPt3ABZ7wSfaHlll2+2N6NSWChTVahWQCFoDWQy1TyzvjRZq69gdaDW7voIa1lglns0hFRt6FTNEtZyVU1bJ4ugbRfvpP4OjH1SSTww3UqBEmvv215tU1sdHfIJKNWWRo0hbgQS8QGBtDF8pDK68CCquXMV62JbBUzRa3bE+OdoLL37m57mBlWLUG4t7O26F758vAdwXn9jzovc9CQdki2jfkRTK/OsrwaHHyOheqjBGFE9HFJ7J8HyRlXvRQi0EHp9f5vDwERzDhbEJy2RZ+KDZ4qnL/HCKpKaS/K107jSkbElAAHV"
         - permanent:
             name: "jck-skytap-aix72-ppc64-3"
             nodeDescription: "AIX 7.2 machine hosted by Skytap"