Updated elgohr/Publish-Docker-Github-Action to a supported version (v5)

.drone.yml

@@ -0,0 +1,35 @@
+kind: pipeline
+name: default
+
+steps:
+  - name: postgres
+    image: postgres:12.3-alpine
+    commands:
+      - until psql -U admin -w installer -c "select 1"; do sleep 5; done
+  - name: build
+    image: golang
+    commands:
+      - CGO_ENABLED=0 go build -o build/bm-inventory cmd/main.go
+      - ./build/bm-inventory &
+      - sleep 10
+      - go test -v ./subsystem/... -count=1 -ginkgo.skip=only_k8s -ginkgo.v
+    environment:
+      INVENTORY: build:8090
+      DB_HOST: postgres
+      DB_PORT: 5432
+      USE_K8S: false
+
+trigger:
+  branch:
+    - master
+  event:
+    - pull_request
+    - push
+
+services:
+  - name: postgres
+    image: postgres:12.3-alpine
+    environment:
+      POSTGRES_PASSWORD: admin
+      POSTGRES_USER: admin
+      POSTGRES_DB: installer

.github/workflows/image-push.yml

@@ -4,7 +4,9 @@ on:
   push:
     branches:
       - master
-
+  pull_request:
+    branches:
+      - master
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -28,23 +30,28 @@ jobs:
     - name: Get release version
       id: get_version
       run: echo ::set-env name=GIT_REVISION::$(echo ${GITHUB_SHA})
+    - name: create python client
+      run: |
+        skipper make create-python-client
     - name: Publish bm-inventory to Registry
-      uses: elgohr/[email protected]
+      if: github.event_name != 'pull_request'
+      uses: elgohr/Publish-Docker-Github-Action@v5
       with:
         name: bm-inventory
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
         REGISTRY: 'quay.io/ocpmetal'
         dockerfile: "Dockerfile.bm-inventory"
         buildargs: GIT_REVISION
-        tags: "stable,${{ env.GIT_REVISION }}"
-    - name: Publish expirer to Registry
-      uses: elgohr/[email protected]
+        tags: "latest,${{ env.GIT_REVISION }}"
+    - name: Publish bm-inventory PR image to Registry
+      if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
+      uses: elgohr/Publish-Docker-Github-Action@v5
       with:
-        name: s3-object-expirer
+        name: bm-inventory
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
         REGISTRY: 'quay.io/ocpmetal'
-        dockerfile: "Dockerfile.s3-object-expirer"
-        buildargs: GIT_REVISION
-        tags: "stable,${{ env.GIT_REVISION }}"
+        dockerfile: "Dockerfile.bm-inventory"
+        buildargs: GIT_REVISION, QUAY_TAG_EXPIRATION
+        tags: "PR_${{ env.GIT_REVISION }}"

.github/workflows/release.yml

@@ -0,0 +1,46 @@
+name: release
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v1
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.x
+    - name: Install dependencies
+      run: |
+        sudo pip install strato-skipper
+        mkdir -p ~/.docker
+        echo "{}" > ~/.docker/config.json
+        touch ${HOME}/.gitconfig
+        ln -s Dockerfile.bm-inventory Dockerfile
+    - name: build
+      run: |
+        skipper make build
+    - name: create python client
+      run: |
+        skipper make create-python-client
+    - name: Get release version
+      id: get_version
+      run: echo ::set-env name=GIT_REVISION::$(echo ${GITHUB_SHA})
+    - name: Get tag
+      id: get_tag
+      run: echo ::set-env name=GIT_TAG::${GITHUB_REF/refs\/tags\//}
+    - name: Publish bm-inventory to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: bm-inventory
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        REGISTRY: 'quay.io/ocpmetal'
+        dockerfile: "Dockerfile.bm-inventory"
+        buildargs: GIT_REVISION
+        tags: "${{ env.GIT_TAG }},${{ env.GIT_REVISION }}"

.github/workflows/unit-test.yml

@@ -9,38 +9,6 @@ on:
       - master
 
 jobs:
-  remove-label:
-    runs-on: ubuntu-latest
-    steps:
-    - name: remove label
-      uses: actions/[email protected]
-      if: github.event_name == 'pull_request'
-      with:
-        github-token: ${{secrets.GITHUB_TOKEN}}
-        script: |
-
-          // Fetch the list of labels attached to the issue that
-          // triggered the workflow
-          const opts = github.issues.listLabelsOnIssue.endpoint.merge({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.issue.number,
-          });
-          const labels = await github.paginate(opts);
-
-          for (const label of labels) {
-            // If the issue has a label named 'tests-passed', remove it
-            if (label.name === 'tests-passed') {
-              await github.issues.removeLabel({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.issue.number,
-                name: 'tests-passed'
-              })
-              return;
-            }
-          }
-
   lint:
     runs-on: ubuntu-latest
     steps:
@@ -73,15 +41,3 @@ jobs:
     - name: test
       run: |
         skipper make build
-    - name: apply label
-      uses: actions/[email protected]
-      if: github.event_name == 'pull_request'
-      with:
-        github-token: ${{secrets.GITHUB_TOKEN}}
-        script: |
-          github.issues.addLabels({
-            issue_number: context.issue.number,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            labels: ['tests-passed']
-          })

.gitignore

@@ -1,5 +1,7 @@
 .idea/
 .vscode/
+.venv/
+venv/
 build/
 kubevirtci/
 **/RCS/**
@@ -10,3 +12,5 @@ __pycache__/
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+
+/vendor

.golangci.yml

@@ -47,6 +47,7 @@ issues:
   # excluded by default patterns execute `golangci-lint run --help`
   exclude:
     - G107
+    - G402  # support scality DisableSSL
 
 linters:
   enable:

Dockerfile.bm-inventory

@@ -1,5 +1,10 @@
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as certs
+
 FROM scratch
+COPY --from=certs /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem /etc/ssl/certs/ca-bundle.crt
+COPY --from=certs /etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt /etc/ssl/certs/ca-bundle.trust.crt
 ARG GIT_REVISION
 LABEL "git_revision"=${GIT_REVISION}
 ADD build/bm-inventory /bm-inventory
+ADD build/bm-inventory-client-1.0.0.tar.gz /clients/bm-inventory-client-1.0.0.tar.gz
 CMD ["/bm-inventory"]

Dockerfile.bm-inventory-build

@@ -1,14 +1,15 @@
-FROM golang:1.14
+FROM golang:1.14.3
 
-RUN apt-get update && apt-get install -y docker.io libvirt-clients awscli python3-pip \
+ENV GO111MODULE=on
+
+RUN apt-get update && apt-get install -y docker.io libvirt-clients awscli python3-pip postgresql \
  && rm -rf /var/lib/apt/lists/*
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0
-RUN go get -u github.com/onsi/ginkgo/ginkgo  # installs the ginkgo CLI
-RUN go get -u github.com/onsi/gomega/...     # fetches the matcher library
-RUN go get -u golang.org/x/tools/cmd/goimports
-RUN go get -u github.com/golang/mock/mockgen
-RUN go get -u github.com/vektra/mockery/.../
-RUN pip3 install boto3
-RUN curl -Lo minikube https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 \
+RUN go get -u github.com/onsi/ginkgo/[email protected] \
+              golang.org/x/tools/cmd/[email protected] \
+              github.com/golang/mock/[email protected] \
+              github.com/vektra/mockery/.../@v1.1.2
+RUN pip3 install boto3==1.13.14 waiting==1.4.1
+RUN curl -Lo minikube https://storage.googleapis.com/minikube/releases/v1.10.1/minikube-linux-amd64 \
   && chmod +x minikube && mkdir -p /usr/local/bin/ && install minikube /usr/local/bin/
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin/kubectl

Dockerfile.test

@@ -0,0 +1,20 @@
+FROM        golang:1.14.3
+
+ENV         GO111MODULE=on
+
+WORKDIR     /assisted-service
+
+COPY        . ./
+
+RUN         curl -sSfL \
+https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \
+sh -s -- -b $(go env GOPATH)/bin v1.24.0
+
+RUN         go get -u \
+github.com/onsi/ginkgo/[email protected] \
+golang.org/x/tools/cmd/[email protected] \
+github.com/golang/mock/[email protected] \
+github.com/vektra/mockery/.../@v1.1.2
+
+ENTRYPOINT  ["make"]
+CMD         ["unit-test"]

Jenkinsfile

@@ -0,0 +1,43 @@
+pipeline {
+  agent { label 'bm-inventory-subsystem' }
+  stages {
+    stage('clear deployment') {
+      steps {
+        sh 'make clear-deployment'
+      }
+    }
+
+    stage('Deploy') {
+      steps {
+        sh '''export PATH=$PATH:/usr/local/go/bin; export OBJEXP=quay.io/ocpmetal/s3-object-expirer:latest; make deploy-test'''
+        sleep 60
+        sh '''# Dump pod statuses;kubectl  get pods -A'''
+      }
+    }
+
+    stage('test') {
+      steps {
+        sh '''export PATH=$PATH:/usr/local/go/bin;make subsystem-run'''
+      }
+    }
+  }
+  post {
+          failure {
+              echo 'Get bm-inventory log'
+              sh '''
+              kubectl get pods -o=custom-columns=NAME:.metadata.name -A | grep bm-inventory | xargs -I {} sh -c "kubectl logs {} -n  assisted-installer > test_dd.log"
+              mv test_dd.log $WORKSPACE/bm-inventory.log || true
+              '''
+
+              echo 'Get mariadb log'
+              sh '''kubectl  get pods -o=custom-columns=NAME:.metadata.name -A | grep mariadb | xargs -I {} sh -c "kubectl logs {} -n  assisted-installer > test_dd.log"
+              mv test_dd.log $WORKSPACE/mariadb.log || true
+              '''
+
+              echo 'Get createimage log'
+              sh '''kubectl  get pods -o=custom-columns=NAME:.metadata.name -A | grep createimage | xargs -I {} sh -c "kubectl logs {} -n  assisted-installer > test_dd.log"
+              mv test_dd.log $WORKSPACE/createimage.log || true
+              '''
+          }
+  }
+}