Skip to content

Commit a6409ea

Browse files
author
Ross
committed
Remove aws from jenkins
1 parent 778e2d9 commit a6409ea

File tree

7 files changed

+8
-311
lines changed

7 files changed

+8
-311
lines changed

etc/sqre/config.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#
33
# general config values
44
#
5-
awscli:
6-
docker_registry:
7-
repo: ghcr.io/lsst-dm/docker-awscli
8-
tag: '1.36.39'
95
gcloud:
106
docker_registry:
117
repo: gcr.io/google.com/cloudsdktool/google-cloud-cli

pipelines/lib/util.groovy

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,58 +1536,6 @@ def runDocumenteer(Map p) {
15361536
} // withEnv
15371537
} // runDocumenteer
15381538

1539-
/**
1540-
* run ltd-mason-travis to push a doc build
1541-
*
1542-
* @param p Map
1543-
* @param p.eupsTag String tag to setup (required). Eg.: 'current', 'b1234'
1544-
* @param p.repoSlug String github repo slug (required). Eg.: 'lsst/pipelines_lsst_io'
1545-
* @param p.ltdProduct String LTD product name (required)., Eg.: 'pipelines'
1546-
* @param p.masonImage String docker image (optional). Defaults to: 'lsstsqre/ltd-mason'
1547-
*/
1548-
def ltdPush(Map p) {
1549-
requireMapKeys(p, [
1550-
'ltdSlug',
1551-
'ltdProduct',
1552-
'repoSlug',
1553-
])
1554-
p = [
1555-
masonImage: 'lsstsqre/ltd-mason',
1556-
] + p
1557-
1558-
1559-
withEnv([
1560-
"LTD_MASON_BUILD=true",
1561-
"LTD_MASON_PRODUCT=${p.ltdProduct}",
1562-
"LTD_KEEPER_URL=https://keeper.lsst.codes",
1563-
"LTD_KEEPER_USER=travis",
1564-
"TRAVIS_PULL_REQUEST=false",
1565-
"TRAVIS_REPO_SLUG=${p.repoSlug}",
1566-
"TRAVIS_BRANCH=${p.ltdSlug}",
1567-
]) {
1568-
withCredentials([[
1569-
$class: 'UsernamePasswordMultiBinding',
1570-
credentialsId: 'ltd-mason-aws',
1571-
usernameVariable: 'LTD_MASON_AWS_ID',
1572-
passwordVariable: 'LTD_MASON_AWS_SECRET',
1573-
],
1574-
[
1575-
$class: 'UsernamePasswordMultiBinding',
1576-
credentialsId: 'ltd-keeper',
1577-
usernameVariable: 'LTD_KEEPER_USER',
1578-
passwordVariable: 'LTD_KEEPER_PASSWORD',
1579-
]]) {
1580-
docker.image(p.masonImage).inside {
1581-
// expect that the service will return an HTTP 502, which causes
1582-
// ltd-mason-travis to exit 1
1583-
sh '''
1584-
ltd-mason-travis --html-dir _build/html --verbose || true
1585-
'''
1586-
} // .inside
1587-
} // withCredentials
1588-
} //withEnv
1589-
} // ltdPush
1590-
15911539
/**
15921540
* run `release/run-rebuild` job and parse result
15931541
*
@@ -1856,15 +1804,6 @@ def Object verifyDrpMetricsConfig() {
18561804
readYamlFile('etc/scipipe/verify_drp_metrics.yaml')
18571805
}
18581806

1859-
/*
1860-
* Get default awscli docker image string
1861-
*
1862-
* @return awscliImage String
1863-
*/
1864-
def String defaultAwscliImage() {
1865-
def dockerRegistry = sqreConfig().awscli.docker_registry
1866-
"${dockerRegistry.repo}:${dockerRegistry.tag}"
1867-
}
18681807

18691808
/*
18701809
* Get default gcloud docker image string

pipelines/release/tarball.groovy

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -667,24 +667,6 @@ def void withGSEupsBucketEnv(Closure run) {
667667
}
668668
} // withCredentials
669669
}
670-
/**
671-
* Declares the following env vars from credentials:
672-
* - AWS_ACCESS_KEY_ID
673-
* - AWS_SECRET_ACCESS_KEY
674-
* - EUPS_S3_BUCKET
675-
*/
676-
def void withEupsBucketEnv(Closure run) {
677-
withCredentials([[
678-
$class: 'UsernamePasswordMultiBinding',
679-
credentialsId: 'aws-eups-push',
680-
usernameVariable: 'AWS_ACCESS_KEY_ID',
681-
passwordVariable: 'AWS_SECRET_ACCESS_KEY'
682-
]]) {
683-
util.withEupsEnv {
684-
run()
685-
}
686-
} // withCredentials
687-
}
688670

689671
/**
690672
* Record logs

seeds/gcp-values/dev-values.yaml

Lines changed: 2 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -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

22942246
checkDeprecation: true
2295-
2296-
awsSecurityGroupPolicies:
2297-
enabled: false
2298-
policies:
2299-
- name: ""
2300-
securityGroupIds: []
2301-
podSelector: {}

0 commit comments

Comments
 (0)