Github3 csm1.1 (#10)

* Replaced stash with github.com * Update to artifactory server * Version to 1.8.3 * Changed vault-kv-enabler version to 1.12.5
Cray-HPE · Jul 28, 2021 · 2c4a8bc · 2c4a8bc
1 parent e6c58c8
commit 2c4a8bc
Show file tree

Hide file tree

Showing 190 changed files with 669 additions and 449 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-1.8.2
+1.8.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.8.3] - 2021-07-28
+
+### Added
+- Conversion for github phase 3
+ - Changed artifactory server
+ - Updated docker images in docker-compose files for csm-built images
+
 ## [1.8.2] - 2021-07-20
 
 ### Added

diff --git a/Dockerfile b/Dockerfile
@@ -35,15 +35,15 @@ FROM build-base AS base
 RUN go env -w GO111MODULE=auto
 
 # Copy all the necessary files to the image.
-COPY cmd $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/cmd
-COPY vendor $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/vendor
-COPY internal $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/internal
-COPY .version $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/.version
+COPY cmd $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/cmd
+COPY vendor $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/vendor
+COPY internal $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/internal
+COPY .version $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/.version
 
 ### Build Stage ###
 FROM base AS builder
 
-RUN set -ex && go build -v -i -o /usr/local/bin/hms-firmware-action stash.us.cray.com/HMS/hms-firmware-action/cmd/hms-firmware-action
+RUN set -ex && go build -v -i -o /usr/local/bin/hms-firmware-action github.com/Cray-HPE/hms-firmware-action/cmd/hms-firmware-action
 
 ### Build python base ###
 

diff --git a/Dockerfile.functionaltesting.Dockerfile b/Dockerfile.functionaltesting.Dockerfile
@@ -61,11 +61,11 @@ ENV CRAY_VAULT_JWT_FILE "/go/configs/token"
 ENV API_URL "http://firmware-action"
 ENV API_SERVER_PORT ":28800"
 
-COPY cmd $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/cmd
+COPY cmd $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/cmd
 COPY configs configs
-COPY vendor $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/vendor
-COPY internal $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/internal
-COPY .version $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/.version
+COPY vendor $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/vendor
+COPY internal $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/internal
+COPY .version $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/.version
 COPY test/functional /test/functional
 COPY test/integration /test/integration
 

diff --git a/Dockerfile.integration.Dockerfile b/Dockerfile.integration.Dockerfile
@@ -35,15 +35,15 @@ FROM build-base AS base
 RUN go env -w GO111MODULE=auto
 
 # Copy all the necessary files to the image.
-COPY cmd $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/cmd
-COPY vendor $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/vendor
-COPY internal $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/internal
-COPY .version $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/.version
+COPY cmd $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/cmd
+COPY vendor $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/vendor
+COPY internal $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/internal
+COPY .version $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/.version
 
 ### Build Stage ###
 FROM base AS builder
 
-RUN set -ex && go build -v -i -o /usr/local/bin/hms-firmware-action stash.us.cray.com/HMS/hms-firmware-action/cmd/hms-firmware-action
+RUN set -ex && go build -v -i -o /usr/local/bin/hms-firmware-action github.com/Cray-HPE/hms-firmware-action/cmd/hms-firmware-action
 
 ### Build python base ###
 

diff --git a/Dockerfile.unittesting.Dockerfile b/Dockerfile.unittesting.Dockerfile
@@ -48,18 +48,18 @@ ENV CRAY_VAULT_JWT_FILE "/go/configs/token"
 
 RUN go env -w GO111MODULE=auto
 
-COPY cmd $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/cmd
+COPY cmd $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/cmd
 COPY configs configs
-COPY vendor $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/vendor
-COPY internal $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/internal
-COPY .version $GOPATH/src/stash.us.cray.com/HMS/hms-firmware-action/.version
+COPY vendor $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/vendor
+COPY internal $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/internal
+COPY .version $GOPATH/src/github.com/Cray-HPE/hms-firmware-action/.version
 
 # if you use CMD, then it will run like a service; we want this to execute the tests and quit
 #RUN go test -v ./...
 RUN set -ex \
  && go version \
- && go test -cover -v -o firmware-action stash.us.cray.com/HMS/hms-firmware-action/internal/domain \
- && go test -cover -v -o firmware-action stash.us.cray.com/HMS/hms-firmware-action/internal/api \
- && go test -cover -v -o firmware-action stash.us.cray.com/HMS/hms-firmware-action/internal/model \
- && go test -cover -v -o firmware-action stash.us.cray.com/HMS/hms-firmware-action/internal/storage \
- && go test -cover -v -o firmware-action stash.us.cray.com/HMS/hms-firmware-action/internal/hsm
+ && go test -cover -v -o firmware-action github.com/Cray-HPE/hms-firmware-action/internal/domain \
+ && go test -cover -v -o firmware-action github.com/Cray-HPE/hms-firmware-action/internal/api \
+ && go test -cover -v -o firmware-action github.com/Cray-HPE/hms-firmware-action/internal/model \
+ && go test -cover -v -o firmware-action github.com/Cray-HPE/hms-firmware-action/internal/storage \
+ && go test -cover -v -o firmware-action github.com/Cray-HPE/hms-firmware-action/internal/hsm
diff --git a/cmd/hms-firmware-action/main.go b/cmd/hms-firmware-action/main.go
@@ -39,14 +39,14 @@ import (
  "github.com/hashicorp/go-retryablehttp"
  "github.com/namsral/flag"
  "github.com/sirupsen/logrus"
- "stash.us.cray.com/HMS/hms-base"
- "stash.us.cray.com/HMS/hms-firmware-action/internal/api"
- "stash.us.cray.com/HMS/hms-firmware-action/internal/domain"
- "stash.us.cray.com/HMS/hms-firmware-action/internal/hsm"
- "stash.us.cray.com/HMS/hms-firmware-action/internal/logger"
- "stash.us.cray.com/HMS/hms-firmware-action/internal/storage"
- trsapi "stash.us.cray.com/HMS/hms-trs-app-api/pkg/trs_http_api"
- "stash.us.cray.com/HMS/hms-certs/pkg/hms_certs"
+ "github.com/Cray-HPE/hms-base"
+ "github.com/Cray-HPE/hms-firmware-action/internal/api"
+ "github.com/Cray-HPE/hms-firmware-action/internal/domain"
+ "github.com/Cray-HPE/hms-firmware-action/internal/hsm"
+ "github.com/Cray-HPE/hms-firmware-action/internal/logger"
+ "github.com/Cray-HPE/hms-firmware-action/internal/storage"
+ trsapi "github.com/Cray-HPE/hms-trs-app-api/pkg/trs_http_api"
+ "github.com/Cray-HPE/hms-certs/pkg/hms_certs"
 )
 
 // Default Port to use

diff --git a/cmd/hms-firmware-action/updateScheduler.go b/cmd/hms-firmware-action/updateScheduler.go
@@ -45,11 +45,11 @@ import (
 
  "github.com/google/uuid"
  "github.com/sirupsen/logrus"
- "stash.us.cray.com/HMS/hms-firmware-action/internal/domain"
- "stash.us.cray.com/HMS/hms-firmware-action/internal/hsm"
- "stash.us.cray.com/HMS/hms-firmware-action/internal/model"
- "stash.us.cray.com/HMS/hms-firmware-action/internal/storage"
- rf "stash.us.cray.com/HMS/hms-smd/pkg/redfish"
+ "github.com/Cray-HPE/hms-firmware-action/internal/domain"
+ "github.com/Cray-HPE/hms-firmware-action/internal/hsm"
+ "github.com/Cray-HPE/hms-firmware-action/internal/model"
+ "github.com/Cray-HPE/hms-firmware-action/internal/storage"
+ rf "github.com/Cray-HPE/hms-smd/pkg/redfish"
 )
 
 type VerifyStatus int

diff --git a/docker-compose.developer.environment.yaml b/docker-compose.developer.environment.yaml
@@ -39,7 +39,7 @@ services:
  networks:
  - rts
  vault-kv-enabler:
- image: arti.dev.cray.com/csm-docker-master-local/vault-kv-enabler:1.11.3
+ image: artifactory.algol60.net/csm-docker/stable/vault-kv-enabler:1.12.5
  environment:
  - VAULT_ADDR=http://vault:8200
  - VAULT_TOKEN=hms
@@ -67,7 +67,7 @@ services:
  networks:
  - rts
  cray-smd-init:
- image: arti.dev.cray.com/csm-docker-master-local/cray-smd:latest
+ image: artifactory.algol60.net/csm-docker/stable/cray-smd:1.29.10
  environment:
  - SMD_DBHOST=hmsds-postgres
  - SMD_DBPORT=5432
@@ -77,7 +77,7 @@ services:
  - rts
  command: /entrypoint.sh smd-init
  cray-smd:
- image: arti.dev.cray.com/csm-docker-master-local/cray-smd:latest
+ image: artifactory.algol60.net/csm-docker/stable/cray-smd:1.29.10
  environment:
  - POSTGRES_HOST=hmsds-postgres
  - POSTGRES_PORT=5432
@@ -125,7 +125,7 @@ services:
  networks:
  - rts
  cray-hms-hmcollector:
- image: arti.dev.cray.com/csm-docker-master-local/hms-hmcollector:latest
+ image: artifactory.algol60.net/csm-docker/stable/hms-hmcollector:2.11.3
  environment:
  - LOG_LEVEL=TRACE
  - SM_URL=http://cray-smd:27779
@@ -144,7 +144,7 @@ services:
  networks:
  - rts
  redfish-simulator:
- image: arti.dev.cray.com/csm-docker-master-local/hms-redfish-translation-service:latest
+ image: artifactory.algol60.net/csm-docker/stable/hms-redfish-translation-service:1.12.4
  environment:
  - SCHEMA_VERSION=2019.1
  - LOG_LEVEL=TRACE
@@ -179,4 +179,4 @@ services:
  rts:
  aliases:
  - x0c0s1b0
- - x0c0s2b0
+ - x0c0s2b0
diff --git a/docker-compose.developer.full.yaml b/docker-compose.developer.full.yaml
@@ -64,7 +64,7 @@ services:
  networks:
  - rts
  vault-kv-enabler:
- image: arti.dev.cray.com/csm-docker-master-local/vault-kv-enabler:1.11.3
+ image: artifactory.algol60.net/csm-docker/stable/vault-kv-enabler:1.12.5
  environment:
  - VAULT_ADDR=http://vault:8200
  - VAULT_TOKEN=hms
@@ -92,7 +92,7 @@ services:
  networks:
  - rts
  cray-smd-init:
- image: arti.dev.cray.com/csm-docker-master-local/cray-smd:latest
+ image: artifactory.algol60.net/csm-docker/stable/cray-smd:1.29.10
  environment:
  - SMD_DBHOST=hmsds-postgres
  - SMD_DBPORT=5432
@@ -102,7 +102,7 @@ services:
  - rts
  command: /entrypoint.sh smd-init
  cray-smd:
- image: arti.dev.cray.com/csm-docker-master-local/cray-smd:latest
+ image: artifactory.algol60.net/csm-docker/stable/cray-smd:1.29.10
  environment:
  - POSTGRES_HOST=hmsds-postgres
  - POSTGRES_PORT=5432
@@ -150,7 +150,7 @@ services:
  networks:
  - rts
  cray-hms-hmcollector:
- image: arti.dev.cray.com/csm-docker-master-local/hms-hmcollector:latest
+ image: artifactory.algol60.net/csm-docker/stable/hms-hmcollector:2.11.3
  environment:
  - LOG_LEVEL=TRACE
  - SM_URL=http://cray-smd:27779
@@ -169,7 +169,7 @@ services:
  networks:
  - rts
  redfish-simulator:
- image: arti.dev.cray.com/csm-docker-master-local/hms-redfish-translation-service:latest
+ image: artifactory.algol60.net/csm-docker/stable/hms-redfish-translation-service:1.12.4
  environment:
  - SCHEMA_VERSION=2019.1
  - LOG_LEVEL=TRACE
@@ -204,4 +204,4 @@ services:
  rts:
  aliases:
  - x0c0s1b0
- - x0c0s2b0
+ - x0c0s2b0
diff --git a/docker-compose.test.integration.yaml b/docker-compose.test.integration.yaml
@@ -60,7 +60,7 @@ services:
  networks:
  - rts
  vault-kv-enabler:
- image: arti.dev.cray.com/csm-docker-master-local/vault-kv-enabler:1.11.3
+ image: artifactory.algol60.net/csm-docker/stable/vault-kv-enabler:1.12.5
  environment:
  - VAULT_ADDR=http://vault:8200
  - VAULT_TOKEN=hms
@@ -84,7 +84,7 @@ services:
  networks:
  - rts
  cray-smd-init:
- image: arti.dev.cray.com/csm-docker-master-local/cray-smd:latest
+ image: artifactory.algol60.net/csm-docker/stable/cray-smd:1.29.10
  environment:
  - SMD_DBHOST=hmsds-postgres
  - SMD_DBPORT=5432
@@ -94,7 +94,7 @@ services:
  - rts
  command: /entrypoint.sh smd-init
  cray-smd:
- image: arti.dev.cray.com/csm-docker-master-local/cray-smd:latest
+ image: artifactory.algol60.net/csm-docker/stable/cray-smd:1.29.10
  environment:
  - POSTGRES_HOST=hmsds-postgres
  - POSTGRES_PORT=5432
@@ -136,7 +136,7 @@ services:
  networks:
  - rts
  cray-hms-hmcollector:
- image: arti.dev.cray.com/csm-docker-master-local/hms-hmcollector:latest
+ image: artifactory.algol60.net/csm-docker/stable/hms-hmcollector:2.11.3
  environment:
  - LOG_LEVEL=TRACE
  - SM_URL=http://cray-smd:27779
@@ -155,7 +155,7 @@ services:
  networks:
  - rts
  redfish-simulator:
- image: arti.dev.cray.com/csm-docker-master-local/hms-redfish-translation-service:latest
+ image: artifactory.algol60.net/csm-docker/stable/hms-redfish-translation-service:1.12.4
  environment:
  - SCHEMA_VERSION=2019.1
  - LOG_LEVEL=TRACE

diff --git a/docker-compose.test.unit.yaml b/docker-compose.test.unit.yaml
@@ -24,7 +24,7 @@ services:
  networks:
  - rts
  vault-kv-enabler:
- image: arti.dev.cray.com/csm-docker-master-local/vault-kv-enabler:1.11.3
+ image: artifactory.algol60.net/csm-docker/stable/vault-kv-enabler:1.12.5
  environment:
  - VAULT_ADDR=http://vault:8200
  - VAULT_TOKEN=hms
@@ -48,7 +48,7 @@ services:
  networks:
  - rts
  cray-smd-init:
- image: arti.dev.cray.com/csm-docker-master-local/cray-smd:latest
+ image: artifactory.algol60.net/csm-docker/stable/cray-smd:1.29.10
  environment:
  - SMD_DBHOST=hmsds-postgres
  - SMD_DBPORT=5432
@@ -58,7 +58,7 @@ services:
  - rts
  command: /entrypoint.sh smd-init
  cray-smd:
- image: arti.dev.cray.com/csm-docker-master-local/cray-smd:latest
+ image: artifactory.algol60.net/csm-docker/stable/cray-smd:1.29.10
  environment:
  - POSTGRES_HOST=hmsds-postgres
  - POSTGRES_PORT=5432
@@ -100,7 +100,7 @@ services:
  networks:
  - rts
  cray-hms-hmcollector:
- image: arti.dev.cray.com/csm-docker-master-local/hms-hmcollector:latest
+ image: artifactory.algol60.net/csm-docker/stable/hms-hmcollector:2.11.3
  environment:
  - LOG_LEVEL=TRACE
  - SM_URL=http://cray-smd:27779
@@ -119,7 +119,7 @@ services:
  networks:
  - rts
  redfish-simulator:
- image: arti.dev.cray.com/csm-docker-master-local/hms-redfish-translation-service:latest
+ image: artifactory.algol60.net/csm-docker/stable/hms-redfish-translation-service:1.12.4
  environment:
  - SCHEMA_VERSION=2019.1
  - LOG_LEVEL=TRACE

diff --git a/go.mod b/go.mod
@@ -1,22 +1,22 @@
-module stash.us.cray.com/HMS/hms-firmware-action
+module github.com/Cray-HPE/hms-firmware-action
 
 go 1.16
 
 require (
+ github.com/Cray-HPE/hms-base v1.15.0
+ github.com/Cray-HPE/hms-certs v1.3.2
+ github.com/Cray-HPE/hms-compcredentials v1.11.2
+ github.com/Cray-HPE/hms-hmetcd v1.10.2
+ github.com/Cray-HPE/hms-securestorage v1.12.2
+ github.com/Cray-HPE/hms-smd v1.29.10
+ github.com/Cray-HPE/hms-trs-app-api v1.6.2
  github.com/Masterminds/semver v1.5.0
  github.com/google/uuid v1.2.0
  github.com/gorilla/mux v1.8.0
- github.com/hashicorp/go-retryablehttp v0.6.8
+ github.com/hashicorp/go-retryablehttp v0.7.0
  github.com/looplab/fsm v0.2.0
  github.com/namsral/flag v1.7.4-pre
- github.com/sirupsen/logrus v1.7.0
+ github.com/sirupsen/logrus v1.8.1
  github.com/stretchr/testify v1.7.0
  go.etcd.io/etcd v3.3.25+incompatible // indirect
- stash.us.cray.com/HMS/hms-base v1.13.0
- stash.us.cray.com/HMS/hms-certs v1.3.0
- stash.us.cray.com/HMS/hms-compcredentials v1.11.0
- stash.us.cray.com/HMS/hms-hmetcd v1.10.0
- stash.us.cray.com/HMS/hms-securestorage v1.12.0
- stash.us.cray.com/HMS/hms-smd v1.29.5
- stash.us.cray.com/HMS/hms-trs-app-api v1.6.0
 )