Merge lp:~alejdg/mojo/jenkins-charm-testing into lp:mojo/mojo-specs

[Alexandre Gomes]

Fix jenkins spec

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 151

=== modified file 'charm-testing/jenkins/deploy'
--- charm-testing/jenkins/deploy	2019-10-08 00:59:46 +0000
+++ charm-testing/jenkins/deploy	2020-01-30 23:01:19 +0000
@@ -13,150 +13,151 @@
                 # display-url-api, mailer, matrix-auth, openid, openid4java
                 # Do not remove
                 plugins: >-
-                    ace-editor-1.1
-                    analysis-core-1.95
-                    ansicolor-0.5.2
+                    ace-editor
+                    analysis-core
+                    ansicolor
                     ant
-                    antisamy-markup-formatter-1.5
-                    apache-httpcomponents-client-4-api-4.5.5-3.0
-                    authentication-tokens-1.3
-                    aws-credentials-1.23
-                    aws-java-sdk-1.11.403
-                    bazaar-1.22
-                    blueocean-1.8.2
-                    blueocean-autofavorite-1.2.2
-                    blueocean-bitbucket-pipeline-1.8.2
-                    blueocean-commons-1.8.2
-                    blueocean-config-1.8.2
-                    blueocean-core-js-1.8.2
-                    blueocean-dashboard-1.8.2
-                    blueocean-display-url-2.2.0
-                    blueocean-events-1.8.2
-                    blueocean-git-pipeline-1.8.2
-                    blueocean-github-pipeline-1.8.2
-                    blueocean-i18n-1.8.2
-                    blueocean-jira-1.8.2
-                    blueocean-jwt-1.8.2
-                    blueocean-personalization-1.8.2
-                    blueocean-pipeline-api-impl-1.8.2
-                    blueocean-pipeline-editor-1.8.2
-                    blueocean-pipeline-scm-api-1.8.2
-                    blueocean-rest-1.8.2
-                    blueocean-rest-impl-1.8.2
-                    blueocean-web-1.8.2
-                    bouncycastle-api-2.17
-                    branch-api-2.0.20
-                    build-blocker-plugin-1.7.3
-                    build-monitor-plugin-1.12+build.201809061734
-                    build-timeout-1.19
-                    claim-2.15
-                    cloudbees-bitbucket-branch-source-2.2.12
-                    cloudbees-folder-6.6
-                    command-launcher-1.2
-                    conditional-buildstep-1.3.6
-                    copyartifact-1.41
-                    credentials-2.1.18
-                    credentials-binding-1.16
-                    dashboard-view-2.9.11
-                    dependency-check-jenkins-plugin-3.3.2
-                    description-setter-1.10
-                    disk-usage-0.2.8
-                    display-url-api-2.2.0
-                    docker-build-publish-1.3.2
-                    docker-build-step-2.0
-                    docker-commons-1.13
-                    docker-workflow-1.17
-                    durable-task-1.25
-                    ec2-1.39
-                    email-ext-2.63
-                    external-monitor-job-1.7
-                    favorite-2.3.2
-                    generic-webhook-trigger-1.45
-                    ghprb-1.42.0
-                    git-3.9.1
-                    git-client-2.7.3
-                    git-server-1.7
-                    github-1.29.2
-                    github-api-1.92
-                    github-branch-source-2.3.6
-                    github-organization-folder-1.6
-                    github-pullrequest-0.2.3
-                    handlebars-1.1.1
-                    handy-uri-templates-2-api-2.1.6-1.0
-                    htmlpublisher-1.16
-                    icon-shim-2.0.3
-                    instant-messaging-1.35
-                    ircbot-2.30
-                    jackson2-api-2.8.11.3
-                    javadoc-1.4
-                    jenkins-design-language-1.8.2
-                    jira-3.0.1
-                    jquery-1.12.4-0
-                    jquery-detached-1.2.1
-                    jsch-0.1.54.2
-                    junit-1.25
-                    ldap-1.20
-                    mailer-1.21
-                    matrix-auth-2.3
-                    matrix-combinations-parameter-1.3.0
-                    matrix-project-1.13
-                    maven-plugin-3.1.2
-                    mercurial-2.4
-                    momentjs-1.1.1
-                    node-iterator-api-1.5.0
-                    nodelabelparameter-1.7.2
-                    openid-2.3
-                    openid4java-0.9.8.0
-                    pam-auth-1.4
-                    parameterized-scheduler-0.6.3
-                    parameterized-trigger-2.35.2
-                    pipeline-build-step-2.7
-                    pipeline-github-lib-1.0
-                    pipeline-graph-analysis-1.7
-                    pipeline-input-step-2.8
-                    pipeline-milestone-step-1.3.1
-                    pipeline-model-api-1.3.2
-                    pipeline-model-declarative-agent-1.1.1
-                    pipeline-model-definition-1.3.2
-                    pipeline-model-extensions-1.3.2
-                    pipeline-rest-api-2.10
-                    pipeline-stage-step-2.3
-                    pipeline-stage-tags-metadata-1.3.2
-                    pipeline-stage-view-2.10
-                    pipeline-utility-steps-2.1.0
-                    plain-credentials-1.4
-                    postbuildscript-2.7.0
-                    pubsub-light-1.12
-                    rebuild-1.28
-                    resource-disposer-0.12
-                    run-condition-1.2
-                    scm-api-2.2.7
-                    script-security-1.46
-                    secondary-timestamper-plugin-1.1
-                    sse-gateway-1.15
-                    ssh-agent-1.16
-                    ssh-credentials-1.14
-                    structs-1.14
-                    thinBackup-1.9
-                    timestamper-1.8.10
-                    token-macro-2.5
-                    variant-1.1
-                    windows-slaves-1.3.1
-                    workflow-aggregator-2.5
-                    workflow-api-2.29
-                    workflow-basic-steps-2.8.2
-                    workflow-cps-2.55
-                    workflow-cps-global-lib-2.11
-                    workflow-durable-task-step-2.21
-                    workflow-job-2.25
-                    workflow-multibranch-2.20
-                    workflow-remote-loader-1.4
-                    workflow-scm-step-2.6
-                    workflow-step-api-2.16
-                    workflow-support-2.20
-                    ws-cleanup-0.34
+                    antisamy-markup-formatter
+                    apache-httpcomponents-client-4-api
+                    authentication-tokens
+                    aws-credentials
+                    aws-java-sdk
+                    bazaar
+                    blueocean
+                    blueocean-autofavorite
+                    blueocean-bitbucket-pipeline
+                    blueocean-commons
+                    blueocean-config
+                    blueocean-core-js
+                    blueocean-dashboard
+                    blueocean-display-url
+                    blueocean-events
+                    blueocean-git-pipeline
+                    blueocean-github-pipeline
+                    blueocean-i18n
+                    blueocean-jira
+                    blueocean-jwt
+                    blueocean-personalization
+                    blueocean-pipeline-api-impl
+                    blueocean-pipeline-editor
+                    blueocean-pipeline-scm-api
+                    blueocean-rest
+                    blueocean-rest-impl
+                    blueocean-web
+                    bouncycastle-api
+                    branch-api
+                    build-blocker-plugin
+                    build-monitor-plugin
+                    build-timeout
+                    claim
+                    cloudbees-bitbucket-branch-source
+                    cloudbees-folder
+                    command-launcher
+                    conditional-buildstep
+                    copyartifact
+                    credentials
+                    credentials-binding
+                    dashboard-view
+                    dependency-check-jenkins-plugin
+                    description-setter
+                    disk-usage
+                    display-url-api
+                    docker-build-publish
+                    docker-build-step
+                    docker-commons
+                    docker-workflow
+                    durable-task
+                    ec2
+                    email-ext
+                    external-monitor-job
+                    favorite
+                    generic-webhook-trigger
+                    ghprb
+                    git
+                    git-client
+                    git-server
+                    github
+                    github-api
+                    github-branch-source
+                    github-organization-folder
+                    github-pullrequest
+                    handlebars
+                    handy-uri-templates-2-api
+                    htmlpublisher
+                    icon-shim
+                    instant-messaging
+                    ircbot
+                    jackson2-api
+                    javadoc
+                    jenkins-design-language
+                    jira
+                    jquery
+                    jquery-detached
+                    jsch
+                    junit
+                    ldap
+                    mailer
+                    matrix-auth
+                    matrix-combinations-parameter
+                    matrix-project
+                    maven-plugin
+                    mercurial
+                    momentjs
+                    node-iterator-api
+                    nodelabelparameter
+                    openid
+                    openid4java
+                    pam-auth
+                    parameterized-scheduler
+                    parameterized-trigger
+                    pipeline-build-step
+                    pipeline-github-lib
+                    pipeline-graph-analysis
+                    pipeline-input-step
+                    pipeline-milestone-step
+                    pipeline-model-api
+                    pipeline-model-declarative-agent
+                    pipeline-model-definition
+                    pipeline-model-extensions
+                    pipeline-rest-api
+                    pipeline-stage-step
+                    pipeline-stage-tags-metadata
+                    pipeline-stage-view
+                    pipeline-utility-steps
+                    plain-credentials
+                    postbuildscript
+                    pubsub-light
+                    rebuild
+                    resource-disposer
+                    run-condition
+                    scm-api
+                    script-security
+                    secondary-timestamper-plugin
+                    sse-gateway
+                    ssh-agent
+                    ssh-credentials
+                    structs
+                    thinBackup
+                    timestamper
+                    token-macro
+                    variant
+                    windows-slaves
+                    workflow-aggregator
+                    workflow-api
+                    workflow-basic-steps
+                    workflow-cps
+                    workflow-cps-global-lib
+                    workflow-durable-task-step
+                    workflow-job
+                    workflow-multibranch
+                    workflow-remote-loader
+                    workflow-scm-step
+                    workflow-step-api
+                    workflow-support
+                    ws-cleanup
                 remove-unlisted-plugins: "yes"
-                plugins-site: "http://archive.admin.canonical.com/other/jenkins-plugins"
+                plugins-site: "https://pkg.jenkins.canonical.com/plugins/"
+                bundle-site: "https://pkg.jenkins.canonical.com"
                 release: bundle
                 tools: ""
         nrpe: