undo changes for testing

Signed-off-by: Marco Moscher <[email protected]>
pravega · Oct 12, 2022 · d6edd99 · d6edd99
1 parent 11b5181
commit d6edd99
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 53 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,60 +15,60 @@ on:
 
 # jobs to run
 jobs:
-  # build:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   - name: Set up Go 1.17
-  #     uses: actions/setup-go@v2
-  #     with:
-  #       go-version: 1.17
-  #     id: go
-  #   - name: Set up Go for root
-  #     run: |
-  #       sudo ln -sf `which go` `sudo which go` || true
-  #       sudo go version
-  #   - name: Check out code into the Go module directory
-  #     uses: actions/checkout@v2
-  #   - name: get go version
-  #     run: go version
-  #   - name: Gofmt and License checks
-  #     run: make check
-  #   - name: unit tests
-  #     run: make test
-  #   - name: Codecov
-  #     uses: codecov/[email protected]
-  #   - name: Set env
-  #     run: |
-  #       echo "KUBERNETES_VERSION=v1.23.1" >> $GITHUB_ENV
-  #       echo "MINIKUBE_VERSION=v1.25.2" >> $GITHUB_ENV
-  #       echo "KUBERNETES_CONFIG_FILE=$HOME/.kube/config" >> $GITHUB_ENV
-  #       echo "CHANGE_MINIKUBE_NONE_USER=true" >> $GITHUB_ENV
-  #   - name: minikube setup
-  #     run: |
-  #       curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/$KUBERNETES_VERSION/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
-  #       curl -Lo minikube https://storage.googleapis.com/minikube/releases/$MINIKUBE_VERSION/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
-  #       sudo mount --make-rshared /
-  #       sudo apt-get install -y conntrack
-  #       CHANGE_MINIKUBE_NONE_USER=true
-  #       export KUBERNETES_CONFIG_FILE=$HOME/.kube/config
-  #       export KUBERNETES_CONFIG_FILE=$HOME/.kube/config;export CHANGE_MINIKUBE_NONE_USER=true;sudo minikube start --vm-driver=none --bootstrapper=kubeadm --kubernetes-version=$KUBERNETES_VERSION
-  #       echo "minikube started, updating context"
-  #       export KUBERNETES_CONFIG_FILE=$HOME/.kube/config;export CHANGE_MINIKUBE_NONE_USER=true; sudo minikube update-context
-  #       echo "context is updated"
-  #       #JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done
-  #       sleep 60
-  #       sudo kubectl create clusterrolebinding add-on-cluster-admin --clusterrole=cluster-admin --serviceaccount=kube-system:default
-  #       echo "created cluster role"
-  #       sudo kubectl cluster-info
-  #       echo "cluster info"
-  #       sudo kubectl -n kube-system get pod -o wide
-  #       sudo kubectl create secret docker-registry regcred --docker-server=https://index.docker.io/v1/ --docker-username="testanisha"  --docker-password="123456789" [email protected]
-  #   - name: E2E
-  #     run: sudo make test-e2e
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go 1.17
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.17
+      id: go
+    - name: Set up Go for root
+      run: |
+        sudo ln -sf `which go` `sudo which go` || true
+        sudo go version
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+    - name: get go version
+      run: go version
+    - name: Gofmt and License checks
+      run: make check
+    - name: unit tests
+      run: make test
+    - name: Codecov
+      uses: codecov/[email protected]
+    - name: Set env
+      run: |
+        echo "KUBERNETES_VERSION=v1.23.1" >> $GITHUB_ENV
+        echo "MINIKUBE_VERSION=v1.25.2" >> $GITHUB_ENV
+        echo "KUBERNETES_CONFIG_FILE=$HOME/.kube/config" >> $GITHUB_ENV
+        echo "CHANGE_MINIKUBE_NONE_USER=true" >> $GITHUB_ENV
+    - name: minikube setup
+      run: |
+        curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/$KUBERNETES_VERSION/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
+        curl -Lo minikube https://storage.googleapis.com/minikube/releases/$MINIKUBE_VERSION/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
+        sudo mount --make-rshared /
+        sudo apt-get install -y conntrack
+        CHANGE_MINIKUBE_NONE_USER=true
+        export KUBERNETES_CONFIG_FILE=$HOME/.kube/config
+        export KUBERNETES_CONFIG_FILE=$HOME/.kube/config;export CHANGE_MINIKUBE_NONE_USER=true;sudo minikube start --vm-driver=none --bootstrapper=kubeadm --kubernetes-version=$KUBERNETES_VERSION
+        echo "minikube started, updating context"
+        export KUBERNETES_CONFIG_FILE=$HOME/.kube/config;export CHANGE_MINIKUBE_NONE_USER=true; sudo minikube update-context
+        echo "context is updated"
+        #JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done
+        sleep 60
+        sudo kubectl create clusterrolebinding add-on-cluster-admin --clusterrole=cluster-admin --serviceaccount=kube-system:default
+        echo "created cluster role"
+        sudo kubectl cluster-info
+        echo "cluster info"
+        sudo kubectl -n kube-system get pod -o wide
+        sudo kubectl create secret docker-registry regcred --docker-server=https://index.docker.io/v1/ --docker-username="testanisha"  --docker-password="123456789" [email protected]
+    - name: E2E
+      run: sudo make test-e2e
   publish:
     name: Publish docker image
     runs-on: ubuntu-latest
-    #needs: build
+    needs: build
     if: github.event_name == 'release' && github.event.action == 'created'
     steps:
     - name: Check out code

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,6 @@
 ARG DOCKER_REGISTRY
 ARG ALPINE_VERSION=3.15
+ARG BUILDPLATFORM=linux/amd64
 FROM --platform=$BUILDPLATFORM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}golang:1.17-alpine${ALPINE_VERSION} as go-builder
 
 ARG PROJECT_NAME=zookeeper-operator

diff --git a/Makefile b/Makefile
@@ -13,9 +13,9 @@ CRD_OPTIONS ?= "crd"
 PROJECT_NAME=zookeeper-operator
 EXPORTER_NAME=zookeeper-exporter
 APP_NAME=zookeeper
-REPO=mmoscher/$(PROJECT_NAME)
+REPO=pravega/$(PROJECT_NAME)
 TEST_REPO=testzkop/$(PROJECT_NAME)
-APP_REPO=mmoscher/$(APP_NAME)
+APP_REPO=pravega/$(APP_NAME)
 ALTREPO=emccorp/$(PROJECT_NAME)
 APP_ALTREPO=emccorp/$(APP_NAME)
 VERSION=$(shell git describe --always --tags --dirty | tr -d "v" | sed "s/\(.*\)-g`git rev-parse --short HEAD`/\1/")