SD build updates (AthenZ#1273)

* SD build updates

* move travis to archive

* add secrets to publish job

* remove travis logback xml files

Co-authored-by: Henry Avetisyan <[email protected]>

clients/go/zms/Makefile

@@ -17,7 +17,7 @@ export GOPATH=$(PWD)
 # we're not going to generate our code during our automated builds since
 # builds must be done based on files already checked-in into git
 
-CICD := $(or ${TRAVIS_PULL_REQUEST},${TRAVIS_TAG})
+CICD := $(or ${SCREWDRIVER},${TRAVIS_PULL_REQUEST},${TRAVIS_TAG})
 
 ifdef CICD
 

clients/go/zts/Makefile

@@ -17,7 +17,7 @@ export GOPATH=$(PWD)
 # we're not going to generate our code during our automated builds since
 # builds must be done based on files already checked-in into git
 
-CICD := $(or ${TRAVIS_PULL_REQUEST},${TRAVIS_TAG})
+CICD := $(or ${SCREWDRIVER},${TRAVIS_PULL_REQUEST},${TRAVIS_TAG})
 
 ifdef CICD
 

clients/java/zms/scripts/make_stubs.sh

@@ -5,7 +5,7 @@
 # however, we're not going to run this utility during our automated builds since
 # builds must be done based on files already checked-in into git
 
-if [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${SCREWDRIVER}" ] || [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
     echo >&2 "------------------------------------------------------------------------";
     echo >&2 "SOURCE NOTICE";
     echo >&2 "------------------------------------------------------------------------";

clients/java/zts/core/scripts/make_stubs.sh

@@ -5,7 +5,7 @@
 # however, we're not going to run this utility during our automated builds since
 # builds must be done based on files already checked-in into git
 
-if [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${SCREWDRIVER}" ] || [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
     echo >&2 "------------------------------------------------------------------------";
     echo >&2 "SOURCE NOTICE";
     echo >&2 "------------------------------------------------------------------------";

core/zms/scripts/make_stubs.sh

@@ -5,7 +5,7 @@
 # however, we're not going to run this utility during our automated builds since
 # builds must be done based on files already checked-in into git
 
-if [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${SCREWDRIVER}" ] || [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
     echo >&2 "------------------------------------------------------------------------";
     echo >&2 "SOURCE NOTICE";
     echo >&2 "------------------------------------------------------------------------";

core/zts/scripts/make_stubs.sh

@@ -5,7 +5,7 @@
 # however, we're not going to run this utility during our automated builds since
 # builds must be done based on files already checked-in into git
 
-if [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${SCREWDRIVER}" ] || [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
     echo >&2 "------------------------------------------------------------------------";
     echo >&2 "SOURCE NOTICE";
     echo >&2 "------------------------------------------------------------------------";
@@ -36,4 +36,4 @@ echo "Generating model classes..."
 rdl -s generate -o src/main/java athenz-java-model $RDL_ZTS_FILE
 
 # Copyright 2016 Yahoo Inc.
-# Licensed under the terms of the Apache version 2.0 license. See LICENSE file for terms.
+# Licensed under the terms of the Apache version 2.0 license. See LICENSE file for terms.

examples/java/instance-provider/provider/scripts/make_stubs.sh

@@ -8,7 +8,7 @@
 # however, we're not going to run this utility during our automated builds since
 # builds must be done based on files already checked-in into git
 
-if [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${SCREWDRIVER}" ] || [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
     echo >&2 "------------------------------------------------------------------------";
     echo >&2 "SOURCE NOTICE";
     echo >&2 "------------------------------------------------------------------------";

rdl/rdl-gen-athenz-go-client/make_generator.sh

@@ -6,7 +6,7 @@
 # generated. Otherwise, the client has all the auto-generated code already
 # checked-in into git.
 
-if [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${SCREWDRIVER}" ] || [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
     echo >&2 "------------------------------------------------------------------------";
     echo >&2 "SOURCE NOTICE";
     echo >&2 "------------------------------------------------------------------------";

rdl/rdl-gen-athenz-go-model/make_generator.sh

@@ -6,7 +6,7 @@
 # generated. Otherwise, the client has all the auto-generated code already
 # checked-in into git.
 
-if [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${SCREWDRIVER}" ] || [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
     echo >&2 "------------------------------------------------------------------------";
     echo >&2 "SOURCE NOTICE";
     echo >&2 "------------------------------------------------------------------------";

rdl/rdl-gen-athenz-java-model/make_generator.sh

@@ -6,7 +6,7 @@
 # generated. Otherwise, the client has all the auto-generated code already
 # checked-in into git.
 
-if [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${SCREWDRIVER}" ] || [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
     echo >&2 "------------------------------------------------------------------------";
     echo >&2 "SOURCE NOTICE";
     echo >&2 "------------------------------------------------------------------------";

rdl/rdl-gen-athenz-server/make_generator.sh

@@ -6,7 +6,7 @@
 # generated. Otherwise, the server has all the auto-generated code already
 # checked-in into git.
 
-if [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${SCREWDRIVER}" ] || [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
     echo >&2 "------------------------------------------------------------------------";
     echo >&2 "SOURCE NOTICE";
     echo >&2 "------------------------------------------------------------------------";

screwdriver.yaml

@@ -1,41 +1,35 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 ---
-cache:
-  job:
-    main: [/main_job_cache]
 
+shared:
+  image: openjdk:8
+  annotations:
+    screwdriver.cd/cpu: 8
+    screwdriver.cd/ram: 16
+    screwdriver.cd/disk: HIGH
+    screwdriver.cd/timeout: 120
+  environment:
+    USER_SHELL_BIN: /bin/bash
+
 jobs:
   pull-request:
     requires: [~pr]
-    image: openjdk:8
-    annotations:
-      screwdriver.cd/cpu: 8
-      screwdriver.cd/ram: 16
-      screwdriver.cd/disk: HIGH
-      screwdriver.cd/timeout: 120
-
     steps:
       - install_dependencies: "screwdriver/scripts/install_deps.sh"
       - build: "screwdriver/scripts/build.sh"
 
-
   main:
     requires: [~commit]
-    image: openjdk:8
-    annotations:
-      screwdriver.cd/cpu: 8
-      screwdriver.cd/ram: 16
-      screwdriver.cd/disk: HIGH
-      screwdriver.cd/timeout: 120
-
-    environment:
-      USER_SHELL_BIN: bash
-      LOCAL_MVN_REPO: "/tmp/athenz/mvnrepo"
-      ATHENZ_MAVEN_EXTRA_OPTS: "-Dmaven.repo.local=/tmp/athenz/mvnrepo -Dmaven.javadoc.skip=true -Dmaven.source.skip=true"
-      CCACHE_TMP_DIR: "/tmp/ccache_tmp"
-      CCACHE_DATA_DIR: "/tmp/athenz/ccache"
+    steps:
+      - install_dependencies: "screwdriver/scripts/install_deps.sh"
+      - build: "screwdriver/scripts/build.sh"
 
+  publish:
+    requires: [~tag]
     steps:
       - install_dependencies: "screwdriver/scripts/install_deps.sh"
       - build: "screwdriver/scripts/build.sh"
       - publish: "screwdriver/scripts/publish.sh"
+    secrets:
+      - BINTRAY_USER
+      - BINTRAY_API_KEY

screwdriver/scripts/build.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
-set -ev
+set -e
 
+export PATH=$PATH:/usr/local/go/bin
 mvn install

screwdriver/scripts/install_deps.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -ev
+set -e
 
 apt-get update
 apt-get clean

servers/zms/scripts/make_stubs.sh

@@ -8,7 +8,7 @@
 # however, we're not going to run this utility during our automated builds since
 # builds must be done based on files already checked-in into git
 
-if [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${SCREWDRIVER}" ] || [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
     echo >&2 "------------------------------------------------------------------------";
     echo >&2 "SOURCE NOTICE";
     echo >&2 "------------------------------------------------------------------------";

servers/zts/scripts/make_stubs.sh

@@ -5,7 +5,7 @@
 # however, we're not going to run this utility during our automated builds since
 # builds must be done based on files already checked-in into git
 
-if [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${SCREWDRIVER}" ] || [ ! -z "${TRAVIS_PULL_REQUEST}" ] || [ ! -z "${TRAVIS_TAG}" ]; then
     echo >&2 "------------------------------------------------------------------------";
     echo >&2 "SOURCE NOTICE";
     echo >&2 "------------------------------------------------------------------------";