@@ -110,7 +110,7 @@ controller:
110110 - name : CASC_VAULT_URL
111111 value : https://vault-ci.lsst.cloud
112112 - name : CASC_VAULT_PATHS
113- value: secret/rubin/rubin-jenkins-control-dev/common,secret/rubin/rubin-jenkins-control-dev/aws-jenkins-master-snapshot,secret/rubin/rubin-jenkins-control-dev/aws-eups-push,secret/rubin/rubin-jenkins-control-dev/aws-eups-backup,secret/rubin/rubin-jenkins-control-dev/aws-eups-tag-admin,secret/rubin/rubin-jenkins-control-dev/aws-doxygen-push,secret/rubin/rubin-jenkins-control-dev/slack-lsstc-token,secret/rubin/rubin-jenkins-control-dev/ghslacker,secret/rubin/rubin-jenkins-control-dev/github-api-token-checks,secret/rubin/rubin-jenkins-control-dev/github-api-token-sqreadmin,secret/rubin/rubin-jenkins-control-dev/github-jenkins-versiondb,secret/rubin/rubin-jenkins-control-dev/github-jenkins,secret/rubin/rubin-jenkins-control-dev/sqre-osx,secret/rubin/rubin-jenkins-control-dev/aws-cmirror-push,secret/rubin/rubin-jenkins-control-dev/github_backup,secret/rubin/rubin-jenkins-control-dev/squash-api-user,secret/rubin/rubin-jenkins-control-dev/dockerhub-sqreadmin,secret/rubin/rubin-jenkins-control-dev/ltd-mason-aws,secret/rubin/rubin-jenkins-control-dev/ltd-keeper,secret/rubin/rubin-jenkins-control-dev/google_archive_registry_sa,secret/rubin/rubin-jenkins-control-dev/github-oauth,secret/rubin/rubin-jenkins-control/sqre-osx,secret/rubin/rubin-jenkins-control-dev/sqre-osx-dev,secret/rubin/rubin-jenkins-control-dev/sqre-mini,secret/rubin/rubin-jenkins-control-dev/rubinobs-dm,secret/rubin/rubin-jenkins-control-dev/gs-eups-push,secret/rubin/rubin-jenkins-control-dev/weka-s3/testdata-ci-lsst
113+ value: secret/rubin/rubin-jenkins-control-dev/common,secret/rubin/rubin-jenkins-control-dev/slack-lsstc-token,secret/rubin/rubin-jenkins-control-dev/ghslacker,secret/rubin/rubin-jenkins-control-dev/github-api-token-checks,secret/rubin/rubin-jenkins-control-dev/github-api-token-sqreadmin,secret/rubin/rubin-jenkins-control-dev/github-jenkins-versiondb,secret/rubin/rubin-jenkins-control-dev/github-jenkins,secret/rubin/rubin-jenkins-control-dev/sqre-osx,secret/rubin/rubin-jenkins-control-dev/github_backup,secret/rubin/rubin-jenkins-control-dev/squash-api-user,secret/rubin/rubin-jenkins-control-dev/dockerhub-sqreadmin,secret/rubin/rubin-jenkins-control-dev/ltd-keeper,secret/rubin/rubin-jenkins-control-dev/google_archive_registry_sa,secret/rubin/rubin-jenkins-control-dev/github-oauth,secret/rubin/rubin-jenkins-control/sqre-osx,secret/rubin/rubin-jenkins-control-dev/sqre-osx-dev,secret/rubin/rubin-jenkins-control-dev/sqre-mini,secret/rubin/rubin-jenkins-control-dev/rubinobs-dm,secret/rubin/rubin-jenkins-control-dev/gs-eups-push,secret/rubin/rubin-jenkins-control-dev/weka-s3/testdata-ci-lsst
114114 # - name: JAVA_OPTS
115115 # value: --add-opens=java.base/java.lang=ALL-UNNAMED,--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
116116 # value: "-Dhttp.nonProxyHosts='*.slac.stanford.edu' -Dhttp.proxyHost=sdfproxy.sdf.slac.stanford.edu -Dhttp.proxyPort=3128 -Dhttps.nonProxyHosts='*.slac.stanford.edu' -Dhttps.proxyHost=sdfproxy.sdf.slac.stanford.edu -Dhttps.proxyPort=3128 -Djava.util.logging.config.file=/var/jenkins_home/logging.properties"
@@ -148,7 +148,7 @@ controller:
148148 - name : CASC_VAULT_URL
149149 value : https://ci-vault.lsst.cloud
150150 - name : CASC_VAULT_PATHS
151- value: secret/rubin/rubin-jenkins-control-dev/common,secret/rubin/rubin-jenkins-control-dev/aws-jenkins-master-snapshot,secret/rubin/rubin-jenkins-control-dev/aws-eups-push,secret/rubin/rubin-jenkins-control-dev/aws-eups-backup,secret/rubin/rubin-jenkins-control-dev/aws-eups-tag-admin,secret/rubin/rubin-jenkins-control-dev/aws-doxygen-push,secret/rubin/rubin-jenkins-control-dev/slack-lsstc-token,secret/rubin/rubin-jenkins-control-dev/ghslacker,secret/rubin/rubin-jenkins-control-dev/github-api-token-checks,secret/rubin/rubin-jenkins-control-dev/github-api-token-sqreadmin,secret/rubin/rubin-jenkins-control-dev/github-jenkins-versiondb,secret/rubin/rubin-jenkins-control-dev/github-jenkins,secret/rubin/rubin-jenkins-control-dev/sqre-osx,secret/rubin/rubin-jenkins-control-dev/aws-cmirror-push,secret/rubin/rubin-jenkins-control-dev/github_backup,secret/rubin/rubin-jenkins-control-dev/squash-api-user,secret/rubin/rubin-jenkins-control-dev/dockerhub-sqreadmin,secret/rubin/rubin-jenkins-control-dev/ltd-mason-aws,secret/rubin/rubin-jenkins-control-dev/ltd-keeper,secret/rubin/rubin-jenkins-control-dev/google_archive_registry_sa,secret/rubin/rubin-jenkins-control-dev/github-oauth,secret/rubin/rubin-jenkins-control/sqre-osx,secret/rubin/rubin-jenkins-control-dev/sqre-osx-dev,secret/rubin/rubin-jenkins-control-dev/sqre-mini,secret/rubin/rubin-jenkins-control-dev/rubinobs-dm,secret/rubin/rubin-jenkins-control-dev/gs-eups-push,secret/rubin/rubin-jenkins-control-dev/weka-s3/testdata-ci-lsst
151+ value: secret/rubin/rubin-jenkins-control-dev/common,secret/rubin/rubin-jenkins-control-dev/slack-lsstc-token,secret/rubin/rubin-jenkins-control-dev/ghslacker,secret/rubin/rubin-jenkins-control-dev/github-api-token-checks,secret/rubin/rubin-jenkins-control-dev/github-api-token-sqreadmin,secret/rubin/rubin-jenkins-control-dev/github-jenkins-versiondb,secret/rubin/rubin-jenkins-control-dev/github-jenkins,secret/rubin/rubin-jenkins-control-dev/sqre-osx,secret/rubin/rubin-jenkins-control-dev/github_backup,secret/rubin/rubin-jenkins-control-dev/squash-api-user,secret/rubin/rubin-jenkins-control-dev/dockerhub-sqreadmin,secret/rubin/rubin-jenkins-control-dev/ltd-keeper,secret/rubin/rubin-jenkins-control-dev/google_archive_registry_sa,secret/rubin/rubin-jenkins-control-dev/github-oauth,secret/rubin/rubin-jenkins-control/sqre-osx,secret/rubin/rubin-jenkins-control-dev/sqre-osx-dev,secret/rubin/rubin-jenkins-control-dev/sqre-mini,secret/rubin/rubin-jenkins-control-dev/rubinobs-dm,secret/rubin/rubin-jenkins-control-dev/gs-eups-push,secret/rubin/rubin-jenkins-control-dev/weka-s3/testdata-ci-lsst
152152 # Set min/max heap here if needed with:
153153 javaOpts : >
154154 -Dorg.jenkinsci.plugins.docker.workflow.client.DockerClient.CLIENT_TIMEOUT=1200
@@ -824,36 +824,6 @@ controller:
824824 id: "weka-access-key"
825825 scope: GLOBAL
826826 secret: "${secret/rubin/rubin-jenkins-control-dev/weka-s3/testdata-ci-lsst/access-key}"
827- - usernamePassword:
828- description: "jenkins master snapshot AWS credentials"
829- id: "aws-jenkins-master-snapshot"
830- password: "${secret/rubin/rubin-jenkins-control-dev/aws-jenkins-master-snapshot/password}"
831- scope: GLOBAL
832- username: "${secret/rubin/rubin-jenkins-control-dev/aws-jenkins-master-snapshot/username}"
833- - usernamePassword:
834- description: "push EUPS packages -> s3"
835- id: "aws-eups-push"
836- password: "${secret/rubin/rubin-jenkins-control-dev/aws-eups-push/password}"
837- scope: GLOBAL
838- username: "${secret/rubin/rubin-jenkins-control-dev/aws-eups-push/username}"
839- - usernamePassword:
840- description: "backup EUPS s3 bucket -> s3 bucket"
841- id: "aws-eups-backup"
842- password: "${secret/rubin/rubin-jenkins-control-dev/aws-eups-backup/password}"
843- scope: GLOBAL
844- username: "${secret/rubin/rubin-jenkins-control-dev/aws-eups-backup/username}"
845- - usernamePassword:
846- description: "manage eups distrib tags in s3 bucket"
847- id: "aws-eups-tag-admin"
848- password: "${secret/rubin/rubin-jenkins-control-dev/aws-eups-tag-admin/password}"
849- scope: GLOBAL
850- username: "${secret/rubin/rubin-jenkins-control-dev/aws-eups-tag-admin/username}"
851- - usernamePassword:
852- description: "push doxygen builds -> s3"
853- id: "aws-doxygen-push"
854- password: "${secret/rubin/rubin-jenkins-control-dev/aws-doxygen-push/password}"
855- scope: GLOBAL
856- username: "${secret/rubin/rubin-jenkins-control-dev/aws-doxygen-push/username}"
857827 - string:
858828 description: "slack lsstc org API token"
859829 id: "slack-lsstc-token"
@@ -909,18 +879,6 @@ controller:
909879 privateKey: "${secret/rubin/rubin-jenkins-control-dev/sqre-mini/private_key}"
910880 scope: GLOBAL
911881 username: "${secret/rubin/rubin-jenkins-control-dev/sqre-mini/username}"
912- - usernamePassword:
913- description: "push conda packages -> s3"
914- id: "aws-cmirror-push"
915- password: "${secret/rubin/rubin-jenkins-control-dev/aws-cmirror-push/password}"
916- scope: GLOBAL
917- username: "${secret/rubin/rubin-jenkins-control-dev/aws-cmirror-push/username}"
918- - usernamePassword:
919- description: "github_backup AWS credentials"
920- id: "github_backup"
921- password: "${secret/rubin/rubin-jenkins-control-dev/github_backup/password}"
922- scope: GLOBAL
923- username: "${secret/rubin/rubin-jenkins-control-dev/github_backup/username}"
924882 - usernamePassword:
925883 description: "user/pass for Squash API endpoint"
926884 id: "squash-api-user"
@@ -933,12 +891,6 @@ controller:
933891 password: "${secret/rubin/rubin-jenkins-control-dev/dockerhub-sqreadmin/password}"
934892 scope: GLOBAL
935893 username: "${secret/rubin/rubin-jenkins-control-dev/dockerhub-sqreadmin/username}"
936- - usernamePassword:
937- description: "ltd-mason"
938- id: "ltd-mason-aws"
939- password: "${secret/rubin/rubin-jenkins-control-dev/ltd-mason-aws/password}"
940- scope: GLOBAL
941- username: "${secret/rubin/rubin-jenkins-control-dev/ltd-mason-aws/username}"
942894 - usernamePassword:
943895 description: "ltd-keeper"
944896 id: "ltd-keeper"
@@ -2292,10 +2244,3 @@ serviceAccountAgent:
22922244# # Ref: https://github.com/maorfr/kube-tasks
22932245
22942246checkDeprecation : true
2295-
2296- awsSecurityGroupPolicies :
2297- enabled : false
2298- policies :
2299- - name : " "
2300- securityGroupIds : []
2301- podSelector : {}
0 commit comments