diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 51e784a..3250825 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -53,7 +53,7 @@ pipeline { deleteDir() unstash 'source' dir(BASE_DIR){ - sh 'make build' + //sh 'make build' } } } @@ -67,7 +67,7 @@ pipeline { deleteDir() unstash 'source' dir(BASE_DIR){ - sh "make test" + //sh "make test" } } } @@ -89,7 +89,7 @@ pipeline { unstash 'source' dir(BASE_DIR){ dockerLogin(secret: "${env.DOCKER_REGISTRY_SECRET}", registry: "${env.REGISTRY}") - sh script: "VERSION=${env.GIT_BASE_COMMIT} IMAGE=${env.TMP_IMAGE} make publish", label: "push docker image to ${env.IMAGE}" + //sh script: "VERSION=${env.GIT_BASE_COMMIT} IMAGE=${env.TMP_IMAGE} make publish", label: "push docker image to ${env.IMAGE}" } } } @@ -97,8 +97,8 @@ pipeline { stage('Integration Tests') { agent none steps { - log(level: 'INFO', text: 'Launching Async ITs') - build(job: env.ITS_PIPELINE, propagate: !env.containsKey('CHANGE_ID'), wait: !env.containsKey('CHANGE_ID'), + build(job: env.ITS_PIPELINE, propagate: "${env.containsKey('CHANGE_ID') ? false : true}", + wait: "${env.containsKey('CHANGE_ID') ? false : true}", parameters: [string(name: 'AGENT_INTEGRATION_TEST', value: 'Opbeans'), string(name: 'BUILD_OPTS', value: "--with-opbeans-java --opbeans-java-image ${env.TMP_IMAGE} --opbeans-java-version ${env.GIT_BASE_COMMIT}"), string(name: 'GITHUB_CHECK_NAME', value: env.GITHUB_CHECK_ITS_NAME), diff --git a/.ci/scripts/gren b/.ci/scripts/gren index 3882c6c..cc3318f 100755 --- a/.ci/scripts/gren +++ b/.ci/scripts/gren @@ -1,3 +1,5 @@ #!/usr/bin/env bash -set -ex -docker run --rm -t -v "$(pwd):/app" -w /app docker.elastic.co/observability-ci/gren "$@" +set -e +IMAGE="docker.elastic.co/observability-ci/gren" +docker pull "${IMAGE}" > /dev/null +docker run --rm -t -v "$(pwd):/app" -u "$(id -u):$(id -g)" "${IMAGE}" "$@" diff --git a/.ci/scripts/release-notes.sh b/.ci/scripts/release-notes.sh index 1c7b4ac..0cbf424 100755 --- a/.ci/scripts/release-notes.sh +++ b/.ci/scripts/release-notes.sh @@ -3,4 +3,4 @@ set -uxeo pipefail GREN_GITHUB_TOKEN=${GREN_GITHUB_TOKEN:?"missing GREN_GITHUB_TOKEN"} -gren release --token="${GREN_GITHUB_TOKEN}" --override -c .grenrc.js -t all +gren release --token="${GREN_GITHUB_TOKEN}" --override -c .grenrc.js -t all --debug