From 47d4faeb5a5f44a441c312cf7b16dd2387757ee0 Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 06:06:50 +0100 Subject: [PATCH 01/24] expired certificate --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 9d14a2cac42c..004a79847b3a 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From 86c8ec66538873cdb292178b152dbf4e8eac3911 Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 06:08:51 +0100 Subject: [PATCH 02/24] Revert "expired certificate" This reverts commit 47d4faeb5a5f44a441c312cf7b16dd2387757ee0. --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 004a79847b3a..9d14a2cac42c 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From b68a4463a06437d17f580a76c4d01edd96e73f7e Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 06:12:26 +0100 Subject: [PATCH 03/24] BotBot.me --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 9d14a2cac42c..004a79847b3a 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From be94197ff258fd08b3863b6a37d8eafcca680ca8 Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 06:15:30 +0100 Subject: [PATCH 04/24] Revert "BotBot.me" This reverts commit b68a4463a06437d17f580a76c4d01edd96e73f7e. --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 004a79847b3a..9d14a2cac42c 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From 06be21deb6b99a243dc2c9423199da954289bceb Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 06:17:49 +0100 Subject: [PATCH 05/24] expired certificate --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 9d14a2cac42c..004a79847b3a 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From 174cf1fcecc8454e38481720fcd8b3439b4db0c9 Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 07:39:39 +0100 Subject: [PATCH 06/24] expired certificate --- src/chrome/content/rules/Nancys_Gone_Green.com.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Nancys_Gone_Green.com.xml b/src/chrome/content/rules/Nancys_Gone_Green.com.xml index 1507ba289d21..f763d2484ee1 100644 --- a/src/chrome/content/rules/Nancys_Gone_Green.com.xml +++ b/src/chrome/content/rules/Nancys_Gone_Green.com.xml @@ -1,4 +1,4 @@ - + From 7748e1725e38529734ac83f17bbf2cc30cf672ad Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 08:04:01 +0100 Subject: [PATCH 07/24] Revert "expired certificate" This reverts commit 174cf1fcecc8454e38481720fcd8b3439b4db0c9. --- src/chrome/content/rules/Nancys_Gone_Green.com.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Nancys_Gone_Green.com.xml b/src/chrome/content/rules/Nancys_Gone_Green.com.xml index f763d2484ee1..1507ba289d21 100644 --- a/src/chrome/content/rules/Nancys_Gone_Green.com.xml +++ b/src/chrome/content/rules/Nancys_Gone_Green.com.xml @@ -1,4 +1,4 @@ - + From 1a48344c18446f6480469b4a5e7534b24c49abe7 Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 08:07:58 +0100 Subject: [PATCH 08/24] expired certificate --- src/chrome/content/rules/Nancys_Gone_Green.com.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Nancys_Gone_Green.com.xml b/src/chrome/content/rules/Nancys_Gone_Green.com.xml index 1507ba289d21..f763d2484ee1 100644 --- a/src/chrome/content/rules/Nancys_Gone_Green.com.xml +++ b/src/chrome/content/rules/Nancys_Gone_Green.com.xml @@ -1,4 +1,4 @@ - + From b63cd7026be9784ede94cb901885057436be551d Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 08:33:15 +0100 Subject: [PATCH 09/24] Revert "expired certificate" This reverts commit 1a48344c18446f6480469b4a5e7534b24c49abe7. --- src/chrome/content/rules/Nancys_Gone_Green.com.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Nancys_Gone_Green.com.xml b/src/chrome/content/rules/Nancys_Gone_Green.com.xml index f763d2484ee1..1507ba289d21 100644 --- a/src/chrome/content/rules/Nancys_Gone_Green.com.xml +++ b/src/chrome/content/rules/Nancys_Gone_Green.com.xml @@ -1,4 +1,4 @@ - + From ec69681e906468e684b910826ab2c1aed748559c Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 08:43:40 +0100 Subject: [PATCH 10/24] Revert "expired certificate" This reverts commit f7dfd2e81228b21efb442028476bedcd2d412475. --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 004a79847b3a..9d14a2cac42c 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From 8152c3d196ea5f780b1c4b48ed6c2c8bc5d78c1e Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 08:49:32 +0100 Subject: [PATCH 11/24] expired certificate --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 9d14a2cac42c..004a79847b3a 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From 6086fbef77b26b4a363ad567af47364ab93fc41b Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 08:58:38 +0100 Subject: [PATCH 12/24] Revert "expired certificate" This reverts commit 8152c3d196ea5f780b1c4b48ed6c2c8bc5d78c1e. --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 004a79847b3a..9d14a2cac42c 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From ec517f9e47b933cf85d7ca8a9d03584d12df9b22 Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 09:16:12 +0100 Subject: [PATCH 13/24] expired certificate --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 9d14a2cac42c..004a79847b3a 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From 2d845b48a42332c8dfea9c71f4c30865aea4030b Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 09:24:29 +0100 Subject: [PATCH 14/24] Revert "expired certificate" This reverts commit ec517f9e47b933cf85d7ca8a9d03584d12df9b22. --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 004a79847b3a..9d14a2cac42c 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From 6f7c73679529739071d00efae8d909dc7188793f Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 09:52:46 +0100 Subject: [PATCH 15/24] Expired Certificate --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 9d14a2cac42c..004a79847b3a 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From 9e3d3859fbbfbdc09610a83f09009fb75b06bfa4 Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 09:56:54 +0100 Subject: [PATCH 16/24] Revert "Expired Certificate" This reverts commit 6f7c73679529739071d00efae8d909dc7188793f. --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 004a79847b3a..9d14a2cac42c 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From 220704f96563e7e568e2100880d0d143345ea39e Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 09:58:31 +0100 Subject: [PATCH 17/24] Revert "Revert "Expired Certificate"" This reverts commit 9e3d3859fbbfbdc09610a83f09009fb75b06bfa4. --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 9d14a2cac42c..004a79847b3a 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From eaecbf19aa9f2bc8cb1eed0294b61b923bc4fb4a Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 10:00:00 +0100 Subject: [PATCH 18/24] Revert "Revert "Revert "Expired Certificate""" This reverts commit 220704f96563e7e568e2100880d0d143345ea39e. --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 004a79847b3a..9d14a2cac42c 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From a8cc2da1965d843da1ead808d77859a6a794a296 Mon Sep 17 00:00:00 2001 From: Tamoor Ahmad Date: Thu, 24 Nov 2016 10:02:18 +0100 Subject: [PATCH 19/24] expired certificate --- src/chrome/content/rules/BotBot.me.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml index 9d14a2cac42c..004a79847b3a 100644 --- a/src/chrome/content/rules/BotBot.me.xml +++ b/src/chrome/content/rules/BotBot.me.xml @@ -4,7 +4,7 @@ - botbot.me --> - + From 3aef5e6910bb0ad3de1e5967208f5f660a813b9c Mon Sep 17 00:00:00 2001 From: Leonid Rashkovsky Date: Thu, 1 Dec 2016 15:08:23 +0100 Subject: [PATCH 20/24] Moving to withCredentials build step --- Jenkinsfile | 10 +++++++++- cliqz/build_sign_and_publish.sh | 12 ++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 38427e3b999f..89a229cbc1b1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,15 @@ node { docker.image(imgName).inside("-u 0:0") { sh './install-dev-dependencies.sh' - sh '/bin/bash ./cliqz/build_sign_and_publish.sh '+CLIQZ_CHANNEL + + withCredentials([ + file(credentialsId: '173621c3-7549-4e29-8005-04175db53e37', variable: 'XPISIGN_CERT'), + file(credentialsId: '3496a127-ea1c-40ab-95ee-7c830dea2a40', variable: 'XPISIGN_PASS'), + [$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: '62c70c1d-7d0a-4eb8-9987-38288ebf25cf', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'], + file(credentialsId: '368f4e39-a1c0-4e11-bafa-e14be548e3ae', variable: 'BALROG_CREDS')]) { + + sh '/bin/bash ./cliqz/build_sign_and_publish.sh '+CLIQZ_CHANNEL + } } sh 'rm -rf secure' diff --git a/cliqz/build_sign_and_publish.sh b/cliqz/build_sign_and_publish.sh index 13f00a24226e..e2955b2b5b04 100755 --- a/cliqz/build_sign_and_publish.sh +++ b/cliqz/build_sign_and_publish.sh @@ -5,7 +5,7 @@ set -e ADDON_ID=https-everywhere@cliqz.com CHANNEL=$1 PATH=/openssl-0.9.8zg/apps/:$PATH -SECURE_PATH=./secure/$ADDON_ID +#SECURE_PATH=./secure/$ADDON_ID if [ $# -eq 0 ]; then @@ -29,22 +29,22 @@ DOWNLOAD_URL=https://s3.amazonaws.com/cdncliqz/update/$CHANNEL/https-everywhere/ echo "CLIQZ: sign" python ./xpi-sign/xpisign.py \ --signer openssl \ - --keyfile $SECURE_PATH/certs \ - --passin file:$SECURE_PATH/pass \ + --keyfile $XPISIGN_CERT \ + --passin file:$XPISIGN_PASS \ pkg/$XPI_NAME \ pkg/$SIGNED_XPI_NAME echo "CLIQZ: upload" -source $SECURE_PATH/upload-creds.sh +#source $SECURE_PATH/upload-creds.sh aws s3 cp pkg/$SIGNED_XPI_NAME $S3_UPLOAD_URL --acl public-read echo "XPI uploaded to: ${S3_UPLOAD_URL}" echo "CLIQZ: publish" python ./cliqz/submitter.py \ - --credentials-file $SECURE_PATH/balrog-creds.txt \ + --credentials-file $BALROG_CREDS \ --username balrogadmin \ --api-root http://balrog-admin.10e99.net/api \ --release-channel $CHANNEL \ --addon-id $ADDON_ID \ --addon-version $VERSION \ - --addon-url $DOWNLOAD_URL + --addon-url $DOWNLOAD_URL/ From ffcea296d2d16be25323fecf8b2e1e895584a8ee Mon Sep 17 00:00:00 2001 From: Leonid Rashkovsky Date: Thu, 1 Dec 2016 15:26:22 +0100 Subject: [PATCH 21/24] Added a parameter to the job --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 89a229cbc1b1..d1d51eedc5da 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,12 @@ node { stage 'checkout' - checkout([$class: 'GitSCM', branches: [[name: '*/cliqz-ci']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: '../workspace@script/xpi-sign']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: XPI_SIGN_CREDENTIALS, url: XPI_SIGN_REPO_URL]]]) + checkout([ + $class: 'GitSCM', + // branches: [[name: '*/BRANCH']], + doGenerateSubmoduleConfigurations: false, + extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: '../workspace@script/xpi-sign']], + submoduleCfg: [], userRemoteConfigs: [[credentialsId: XPI_SIGN_CREDENTIALS, url: XPI_SIGN_REPO_URL]]]) stage 'build' From d292f0718205fe312df7e2da427df06c6c0eafde Mon Sep 17 00:00:00 2001 From: Leonid Rashkovsky Date: Thu, 1 Dec 2016 15:30:13 +0100 Subject: [PATCH 22/24] Uncommented the branches parameter --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d1d51eedc5da..a6610a40ba86 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ node { checkout([ $class: 'GitSCM', - // branches: [[name: '*/BRANCH']], + branches: [[name: '*/BRANCH']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: '../workspace@script/xpi-sign']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: XPI_SIGN_CREDENTIALS, url: XPI_SIGN_REPO_URL]]]) From 5d85cdd6b7ced295a1541ed2e0eb2ad73d494f87 Mon Sep 17 00:00:00 2001 From: Leonid Rashkovsky Date: Thu, 1 Dec 2016 15:36:47 +0100 Subject: [PATCH 23/24] Uncommented the branches parameter --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a6610a40ba86..fa618cdb8702 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ node { checkout([ $class: 'GitSCM', - branches: [[name: '*/BRANCH']], + //branches: [[name: '*/BRANCH']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: '../workspace@script/xpi-sign']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: XPI_SIGN_CREDENTIALS, url: XPI_SIGN_REPO_URL]]]) From 2f5716c384e7162af04f2775c9165dfcc92bb0ea Mon Sep 17 00:00:00 2001 From: Leonid Rashkovsky Date: Thu, 1 Dec 2016 16:14:13 +0100 Subject: [PATCH 24/24] Returned the branch to submodule checkout --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index fa618cdb8702..08218f4ecab4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,11 +4,12 @@ node { checkout([ $class: 'GitSCM', - //branches: [[name: '*/BRANCH']], + branches: [[name: '*/cliqz-ci']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: '../workspace@script/xpi-sign']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: XPI_SIGN_CREDENTIALS, url: XPI_SIGN_REPO_URL]]]) + stage 'build' def imgName = "cliqz-oss/https-everywhere:${env.BUILD_TAG}"