Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@Library('pipeline-utils')
import com.snowflake.DevEnvUtils
import groovy.json.JsonOutput


Expand All @@ -10,10 +12,17 @@ timestamps {
env.GIT_COMMIT = scmInfo.GIT_COMMIT
}

stage('Authenticate Artifactory') {
script {
new DevEnvUtils().withSfCli {
sh "sf artifact oci auth"
}
}
}

stage('Build') {
withCredentials([
usernamePassword(credentialsId: '063fc85b-62a6-4181-9d72-873b43488411', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
string(credentialsId: 'a791118f-a1ea-46cd-b876-56da1b9bc71c', variable: 'NEXUS_PASSWORD')
]) {
sh '''\
|#!/bin/bash -e
Expand Down Expand Up @@ -42,7 +51,6 @@ timestamps {
'Test Authentication': {
stage('Test Authentication') {
withCredentials([
string(credentialsId: 'a791118f-a1ea-46cd-b876-56da1b9bc71c', variable: 'NEXUS_PASSWORD'),
string(credentialsId: 'sfctest0-parameters-secret', variable: 'PARAMETERS_SECRET')
]) {
sh '''\
Expand Down
2 changes: 1 addition & 1 deletion ci/_init.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash -e

export PLATFORM=$(echo $(uname) | tr '[:upper:]' '[:lower:]')
export INTERNAL_REPO=nexus.int.snowflakecomputing.com:8086
export INTERNAL_REPO=artifactory.ci1.us-west-2.aws-dev.app.snowflake.com/internal-production-docker-snowflake-virtual
if [[ -z "$GITHUB_ACTIONS" ]]; then
# Use the internal Docker Registry
export DOCKER_REGISTRY_NAME=$INTERNAL_REPO/docker
Expand Down
1 change: 0 additions & 1 deletion ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
set -o pipefail
THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $THIS_DIR/_init.sh
source $THIS_DIR/scripts/login_internal_docker.sh

if [[ -z "$GITHUB_ACTIONS" ]]; then
export GIT_URL=${GIT_URL:-https://github.com/snowflakedb/snowflake-connector-nodejs.git}
Expand Down
1 change: 0 additions & 1 deletion ci/image/proxy/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ set -o pipefail
THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $THIS_DIR/../../_init.sh

source $THIS_DIR/../../scripts/login_internal_docker.sh
source $THIS_DIR/../../scripts/login_docker.sh

docker push $DOCKER_REGISTRY_NAME/client-squid
Expand Down
3 changes: 1 addition & 2 deletions ci/image/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ set -o pipefail
THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $THIS_DIR/../_init.sh

source $THIS_DIR/../scripts/login_internal_docker.sh
source $THIS_DIR/../scripts/login_docker.sh

for image in $(docker images --format "{{.ID}},{{.Repository}}:{{.Tag}}" | grep "nexus.int.snowflakecomputing.com" | grep "client-$DRIVER_NAME"); do
for image in $(docker images --format "{{.ID}},{{.Repository}}:{{.Tag}}" | grep "artifactory.ci1.us-west-2.aws-dev.app.snowflake.com" | grep "client-$DRIVER_NAME"); do
target_id=$(echo $image | awk -F, '{print $1}')
target_name=$(echo $image | awk -F, '{print $2}')
for name in "${!BUILD_IMAGE_NAMES[@]}"; do
Expand Down
18 changes: 0 additions & 18 deletions ci/scripts/login_internal_docker.sh

This file was deleted.

1 change: 0 additions & 1 deletion ci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
set -o pipefail
THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $THIS_DIR/_init.sh
source $THIS_DIR/scripts/login_internal_docker.sh

export WORKSPACE=${WORKSPACE:-/tmp}
export NETWORK_NAME=proxytest
Expand Down
2 changes: 1 addition & 1 deletion ci/test_authentication.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ docker run \
-v $(cd $THIS_DIR/.. && pwd):/mnt/host \
-v $WORKSPACE:/mnt/workspace \
--rm \
nexus.int.snowflakecomputing.com:8086/docker/snowdrivers-test-external-browser:14 \
artifactory.ci1.us-west-2.aws-dev.app.snowflake.com/internal-production-docker-snowflake-virtual/docker/snowdrivers-test-external-browser:14 \
"/mnt/host/ci/container/test_authentication.sh"
Loading