add ssh-key

.gitlab-ci.yml

@@ -27,11 +27,6 @@ stages:
 #   - static-data: Array of all static data in AWS s3
 ####
 .templates:
-  fault-sections: &fault-sections |-
-    cd ..;
-    rm -rf ${FAULT_SECTIONS};
-    git clone ${FAULT_SECTIONS_GIT};
-    cd ${CI_PROJECT_NAME}
   install-aws: &install-aws |-
     apk -v --update add --no-cache python py-pip groff;
     pip install awscli;
@@ -44,6 +39,13 @@ stages:
     STATIC_DATA="
       ${DATA_CONUS_2018A}
     ";
+  ssh-key: &ssh-key |-
+    eval $(ssh-agent -s);
+    mkdir -p ~/.ssh;
+    chmod 700 ~/.ssh;
+    echo "${SSH_PRIVATE_KEY}" >> ~/.ssh/id_rsa;
+    chmod 0600 ~/.ssh/id_rsa;
+    echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config;
 
 ####
 # Template: Devlopment tags
@@ -63,7 +65,7 @@ stages:
     - merge_request
     - master@ghsc/nshmp/nshmp-netcdf
   before_script:
-    - *nshmp-lib
+    - *ssh-key
 
 ####
 # Template: Deploy to Docker Swarm
@@ -162,8 +164,7 @@ Unit Tests:
     - tags@ghsc/nshmp/nshmp-netcdf
   coverage: '/Total.*?([0-9]{1,3})%/'
   before_script:
-    - *fault-sections
-    - *nshmp-lib
+    - *ssh-key
   script:
     - ./gradlew --no-daemon check;
     - cat ${JACOCO_HTML_DIR}/index.html;
@@ -188,8 +189,7 @@ Build Image:
     - tags@ghsc/nshmp/nshmp-netcdf
   before_script:
     - *install-aws
-    - *nshmp-lib
-    - mv ../${NSHMP_LIB} .
+    - *ssh-key
   script:
     - docker build -t local/${IMAGE_NAME} .
 
@@ -207,9 +207,8 @@ Build/Publish Data Images:
     - tags@ghsc/nshmp/nshmp-netcdf
   before_script:
     - *install-aws
-    - *nshmp-lib
     - *static-data
-    - mv ../${NSHMP_LIB} .
+    - *ssh-key
     - mkdir ${DOCKER_DIR}
   script:
     - echo "${CHS_PASSWORD}" | docker login --username ${CHS_USERNAME} --password-stdin ${CODE_REGISTRY}

build.gradle

@@ -10,10 +10,6 @@ plugins {
   id "com.diffplug.gradle.spotless" version "3.27.1"
 }
 
-apply from: project(":nshmp-lib").file("gradle/git-hooks.gradle")
-apply from: project(":nshmp-lib").file("gradle/spotbugs.gradle")
-apply from: project(":nshmp-lib").file("gradle/spotless.gradle")
-
 sourceCompatibility = JavaVersion.VERSION_11
 compileJava.options.encoding = "UTF-8"
 
@@ -27,9 +23,27 @@ repositories {
   }
 }
 
-dependencies {
-  implementation project(":nshmp-lib")
+git {
+  implementation("git@code.usgs.gov:ghsc/nshmp/nshmp-lib.git", {
+    name "nshmp-netcdf-dep--nshmp-lib"
+    tag "v0.0.4"
+  })
+}
+
+ext {
+  nshmpLib = "libs/nshmp-netcdf-dep--nshmp-lib"
+  nshmpLibGradleDir = "${nshmpLib}/gradle"
+  spotbugsDir = "${nshmpLib}/gradle"
+  spotlessDir = "${nshmpLib}/src/main/resources"
+  swaggerDir = "swagger-files"
+}
 
+apply from: "${nshmpLibGradleDir}/git-hooks.gradle"
+apply from: "${nshmpLibGradleDir}/spotbugs.gradle"
+apply from: "${nshmpLibGradleDir}/spotless.gradle"
+
+
+dependencies {
   // NetCDF
   implementation "edu.ucar:cdm:${cdmVersion}"
   implementation "edu.ucar:netcdf4:${netcdfVersion}"
@@ -63,10 +77,6 @@ dependencies {
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 }
 
-ext {
-  swaggerDir = "swagger-files"
-}
-
 test {
   useJUnitPlatform()
 }

gradle.properties

@@ -7,3 +7,4 @@ netcdfVersion = 5.1.0
 slfVersion = 1.7.30
 swaggerVersion = 2.1.1
 mnOpenAPIVersion = 1.4.0
+nshmFaultSectionsTag = v0.1

settings.gradle

-rootProject.name = 'nshmp-netcdf'
-include ':nshmp-lib'
-project(':nshmp-lib').projectDir = new File(settingsDir, '../nshmp-lib')
+plugins {
+  id "com.alexvasilkov.git-dependencies" version "2.0.1"
+}
+
+rootProject.name = "nshmp-netcdf"
+
+git {
+  // Required for nshmp-lib tests
+  fetch ("git@code.usgs.gov:ghsc/nshmp/nshm-fault-sections.git", {
+    tag nshmFaultSectionsTag
+  })
+}