Merge branch 'main' of github.com:CDLUC3/mrt-doc

design/aws-build/README.md

@@ -47,7 +47,7 @@ graph TD
 
 ---
 
-## Artifact Build Order
+## Artifact Build Dependencies
 
 ```mermaid
 graph TD
@@ -77,68 +77,33 @@ graph TD
   DOCKSTACK -->DOCKTEST
 ```
 
-### Repos
+### Build Sequence
+1. Build Docker Maven IT Images --> ECR
+2. Build Docker Stack Generic Services --> ECR
+3. Build JAR files --> Code Artifact
+4. Ruby libraries and gems - build from github tag rather than from a gem
+5. Build WAR files --> Code Artifact
+6. Build Docker Stack Merritt Services (Tomcat and Rails) --> ECR
+7. Build Lambda Docker Images --> ECR
+
+
+## Anticipated Outputs
+- https://merritt.uc3dev.cdlib.org/index.html
+  - [html source](https://github.com/CDLUC3/merritt-tinker/blob/main/aws/uc3-mrt-devresources/index.html)
+
+## Environment Variables for Builds
+
+### Stack Output
+- domain: 'merritt.uc3dev.cdlib.org'
+- hosted_zone: ... # note that DMP stores this in SSM
+- S3CFBUCKET
+- S3PRIVBUCKET
+- CFDISTRIBUTIONID ... # used to invalidate a cloudfront cache
+
+### Computed Environment or Hard Coded
+- export AWS_ACCOUNT_ID=`aws sts get-caller-identity| jq -r .Account`
+- export AWS_REGION=us-west-2
+- export ECR_REGISTRY=${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com
+- export CODEARTIFACT_AUTH_TOKEN=`aws codeartifact get-authorization-token --domain cdlib-uc3-mrt --domain-owner $AWS_ACCOUNT_ID --region us-west-2 --query authorizationToken --output text`
 
-- Documentation
-  - mrt-doc
-    - Outputs: Cloudfront Webapp (Manifest Tool)
-  - mrt-doc-private
-  - merritt_ldap_tools
-  - mrt-ansible-service-restart
-  - mrt-box
-  - mrt-maint
-  - mrt-jenkins
-- Configuration
-  - mrt-ingest-profiles
-    - Private S3 bucket
-  - mrt-dashboard-config
-    - Private S3 bucket
-  - mrt-tomcat
-- Docker Maven IT Images
-  - merritt-docker_inttest
-    - Outputs: ECR Image
-- Docker Stack Generic Services
-  - zookeeper
-  - mysql
-  - minio
-  - ldap
-  - smtp_mock
-  - ezid_mock
-  - merritt_init
-  - callback
-  - mrt-integ-tests
-- Docker Stack Merritt Services
-  - store
-  - ingest
-  - audit
-  - replic
-  - inventory
-  - ui
-- Jar: Merritt Libraries
-  - Outputs: Code Artifact and Javadoc
-  - mrt-zk_java
-  - mrt-core2
-  - mrt-cloud
-- War: Merritt Services
-  - Outputs: Code Artifact and ECR Image
-  - mrt-store
-  - mrt-ingest
-  - mrt-audit
-  - mrt-replic
-  - mrt-inventory
-- Gem: Merritt Libraries
-  - Outputs: Code Artifact and Rubydocs
-  - uc3-ssm
-  - mrt-zk_ruby
-- Ruby App Code
-  - mrt-dashboard
-    - Outputs: ECR Image, Cloudfront: Swagger Docs
-  - mrt-admin-lambda
-    - Outputs: ECR Image, Cloudfront: Generated Documentation
-  - mrt-cron
-    - Outputs: Cloudfront: RevealJS presentation
-  - mrt-atom
-- Deprecated Libraries
-  - cdl-zk-queue
-  - mrt-zoo
 

releases/sprint-log.md

@@ -1,5 +1,39 @@
 ## Sprint Goals
 
+#### Sprint 105: June 19, 2024 - July 9, 2024
+- Ingest
+  - Queue redesign (Part 3) - Support additional zookeeper states: #1441
+  - Integrate mrt-zk library into inventory service #1868
+  - Use new mrt-zk methods for queue hold, collection hold, ark locking #1883
+  - Create queue test plan #1934
+- Storage, Update object strategy
+  - SDSC S3 Storage #1927
+  - Establish SDSC backup bucket for Nuxeo object correction #1897
+- UC3 AWS account
+  - UC3 AWS: Explore AWS CodeArtifact to simplify CodeBuild jobs #1931
+  - UC3 AWS: Create Cloud Front Distribution for Merritt DEV resources #1850
+- Dev-ops
+  - [Merritt-Tomcat] Add "ingestqueue" symlink back into Tomcat server.xml for ingest workers #95
+  - Capture/document all VSCode dependencies #1944
+  - Dependabot: gem updates, June-July 2024 #1935
+- Admin
+  - Limit popups when deleting multiple queue jobs #1946
+- Nuxeo Object Updates
+  - Providing UCI with file lists of changeToken-impacted objects #1938
+- Collection Health Prototype
+  - Analysis documentation: #1895
+- UCB Law Robbins Collection
+  - Batch 3-4 validation: #1939
+- ETDs
+  - UCI records processing: #1942
+  - UCSB Legacy ETDs #1926
+
+#### Releases:
+Stage:
+- Inventory mrt-zk implementation, Ingest mrt-zk implementation (to Production in August)
+Production:
+- Store mrt-zk implementation
+
 #### Sprint 104:  May 29, 2024 - June 18, 2024
 - Ingest
   - Investigate approaches to supporting additional ZK states: #1441
@@ -26,8 +60,9 @@
 
 #### Releases:
 Stage:
-- Store/Access ZK Implementation
+- Ingest mrt-zk implementation, Store/Access mrt-zk implementation
 Production:
+- Access mrt-zk implementation
 
 #### Sprint 103:  May 8, 2024 - May 28, 2024
 - Ingest